ts-procedures 8.1.1 → 8.2.1

package/build/codegen/targets/_shared/write-files.test.js

@@ -1,8 +1,13 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { mkdir, readFile, rm, writeFile, stat, mkdtemp } from 'node:fs/promises';
+import { mkdir, readFile, rm, writeFile, stat, mkdtemp, readdir } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { writeGeneratedFiles } from './write-files.js';
+import { CODEGEN_HEADER } from '../../constants.js';
+/** Build file contents that carry the package signature (a generated file). */
+function signed(body = 'export const x = 1\n') {
+    return `${CODEGEN_HEADER}\n\n${body}`;
+}
 describe('writeGeneratedFiles', () => {
     describe('dryRun mode', () => {
         let logSpy;
@@ -23,20 +28,38 @@ describe('writeGeneratedFiles', () => {
             // Sanity: the dir was not created.
             await expect(stat(dir)).rejects.toBeInstanceOf(Error);
         });
-        it('logs a clean-outDir notice when cleanOutDir is true', async () => {
-            await writeGeneratedFiles([], '/out', { dryRun: true, cleanOutDir: true });
-            expect(logSpy).toHaveBeenCalledWith('[dry-run] Would clean outDir: /out');
-        });
-        it('does not log clean-outDir when cleanOutDir is false', async () => {
-            await writeGeneratedFiles([{ path: '/out/x', code: 'x' }], '/out', { dryRun: true });
-            const messages = logSpy.mock.calls.map((c) => c[0]);
-            expect(messages.find((m) => String(m).includes('Would clean'))).toBeUndefined();
-        });
         it('counts bytes as utf-8', async () => {
             // "é" is 2 bytes in utf-8.
             await writeGeneratedFiles([{ path: '/x/e.txt', code: 'é' }], '/x', { dryRun: true });
             expect(logSpy).toHaveBeenCalledWith('[dry-run] Would write: /x/e.txt (2 bytes)');
         });
+        it('logs would-remove for an orphaned generated file under cleanOutDir, without deleting it', async () => {
+            const outDir = await mkdtemp(join(tmpdir(), 'write-files-dry-'));
+            try {
+                await writeFile(join(outDir, 'orphan.ts'), signed(), 'utf-8');
+                await writeGeneratedFiles([{ path: join(outDir, 'fresh.ts'), code: signed() }], outDir, { dryRun: true, cleanOutDir: true });
+                expect(logSpy).toHaveBeenCalledWith(`[dry-run] Would remove orphaned generated file: ${join(outDir, 'orphan.ts')}`);
+                // Nothing was actually removed.
+                expect(await readFile(join(outDir, 'orphan.ts'), 'utf-8')).toBe(signed());
+            }
+            finally {
+                await rm(outDir, { recursive: true, force: true });
+            }
+        });
+        it('does not log a would-remove notice when cleanOutDir is false', async () => {
+            const outDir = await mkdtemp(join(tmpdir(), 'write-files-dry-'));
+            try {
+                await writeFile(join(outDir, 'orphan.ts'), signed(), 'utf-8');
+                await writeGeneratedFiles([{ path: join(outDir, 'x.ts'), code: signed() }], outDir, {
+                    dryRun: true,
+                });
+                const messages = logSpy.mock.calls.map((c) => String(c[0]));
+                expect(messages.find((m) => m.includes('Would remove'))).toBeUndefined();
+            }
+            finally {
+                await rm(outDir, { recursive: true, force: true });
+            }
+        });
     });
     describe('real write mode', () => {
         let outDir;
@@ -59,20 +82,63 @@ describe('writeGeneratedFiles', () => {
             await writeGeneratedFiles([{ path: join(nested, 'x.txt'), code: 'x' }], nested);
             expect(await readFile(join(nested, 'x.txt'), 'utf-8')).toBe('x');
         });
-        it('removes outDir when cleanOutDir is true before writing', async () => {
-            // Pre-populate a stale file.
-            await mkdir(outDir, { recursive: true });
-            await writeFile(join(outDir, 'stale.txt'), 'stale', 'utf-8');
-            await writeGeneratedFiles([{ path: join(outDir, 'fresh.txt'), code: 'fresh' }], outDir, { cleanOutDir: true });
-            await expect(readFile(join(outDir, 'stale.txt'), 'utf-8')).rejects.toBeInstanceOf(Error);
-            expect(await readFile(join(outDir, 'fresh.txt'), 'utf-8')).toBe('fresh');
+        describe('cleanOutDir (marker-based prune)', () => {
+            it('removes an orphaned generated file that is no longer emitted', async () => {
+                // A previously-generated scope file that this run does not re-emit.
+                await writeFile(join(outDir, 'orphan-scope.ts'), signed(), 'utf-8');
+                await writeGeneratedFiles([{ path: join(outDir, 'fresh.ts'), code: signed() }], outDir, { cleanOutDir: true });
+                await expect(readFile(join(outDir, 'orphan-scope.ts'), 'utf-8')).rejects.toBeInstanceOf(Error);
+                expect(await readFile(join(outDir, 'fresh.ts'), 'utf-8')).toBe(signed());
+            });
+            it('never deletes a file that lacks the package signature', async () => {
+                // Hand-written file the developer co-located in the output dir.
+                await writeFile(join(outDir, 'hand-written.ts'), 'export const mine = 1\n', 'utf-8');
+                // Even a file that merely imports from ts-procedures (no -codegen token).
+                await writeFile(join(outDir, 'helper.ts'), "import { createClient } from 'ts-procedures/client'\n", 'utf-8');
+                await writeGeneratedFiles([{ path: join(outDir, 'fresh.ts'), code: signed() }], outDir, { cleanOutDir: true });
+                expect(await readFile(join(outDir, 'hand-written.ts'), 'utf-8')).toBe('export const mine = 1\n');
+                expect(await readFile(join(outDir, 'helper.ts'), 'utf-8')).toBe("import { createClient } from 'ts-procedures/client'\n");
+            });
+            it('does not delete a signed file that is part of the current output', async () => {
+                // Pre-existing signed file that IS re-emitted this run — it should be
+                // overwritten, not removed-then-rewritten in a way that loses it.
+                await writeFile(join(outDir, 'users.ts'), signed('old'), 'utf-8');
+                await writeGeneratedFiles([{ path: join(outDir, 'users.ts'), code: signed('new') }], outDir, { cleanOutDir: true });
+                expect(await readFile(join(outDir, 'users.ts'), 'utf-8')).toBe(signed('new'));
+            });
+            it('prunes orphans left by a different package version (version-agnostic)', async () => {
+                // A file generated by an older release: different version in the header.
+                const oldHeader = '// Auto-generated by ts-procedures-codegen (v0.0.1) — do not edit';
+                await writeFile(join(outDir, 'legacy.ts'), `${oldHeader}\n\nexport const y = 2\n`, 'utf-8');
+                await writeGeneratedFiles([{ path: join(outDir, 'fresh.ts'), code: signed() }], outDir, { cleanOutDir: true });
+                await expect(readFile(join(outDir, 'legacy.ts'), 'utf-8')).rejects.toBeInstanceOf(Error);
+            });
+            it('skips subdirectories entirely', async () => {
+                const sub = join(outDir, 'nested');
+                await mkdir(sub, { recursive: true });
+                await writeFile(join(sub, 'inner.ts'), signed(), 'utf-8');
+                await writeGeneratedFiles([{ path: join(outDir, 'fresh.ts'), code: signed() }], outDir, { cleanOutDir: true });
+                // The nested dir and its signed file are untouched.
+                expect(await readFile(join(sub, 'inner.ts'), 'utf-8')).toBe(signed());
+                const entries = await readdir(outDir);
+                expect(entries).toContain('nested');
+            });
+            it('does not throw when outDir does not exist yet', async () => {
+                const fresh = join(outDir, 'brand-new');
+                await expect(writeGeneratedFiles([{ path: join(fresh, 'a.ts'), code: signed() }], fresh, {
+                    cleanOutDir: true,
+                })).resolves.toBeUndefined();
+                expect(await readFile(join(fresh, 'a.ts'), 'utf-8')).toBe(signed());
+            });
         });
-        it('does not remove outDir when cleanOutDir is false', async () => {
-            await mkdir(outDir, { recursive: true });
+        it('does not remove anything when cleanOutDir is false', async () => {
+            await writeFile(join(outDir, 'orphan.ts'), signed(), 'utf-8');
             await writeFile(join(outDir, 'keep.txt'), 'keep', 'utf-8');
-            await writeGeneratedFiles([{ path: join(outDir, 'new.txt'), code: 'new' }], outDir);
+            await writeGeneratedFiles([{ path: join(outDir, 'new.ts'), code: signed() }], outDir);
+            // Even a signed orphan stays put when cleanOutDir is not requested.
+            expect(await readFile(join(outDir, 'orphan.ts'), 'utf-8')).toBe(signed());
             expect(await readFile(join(outDir, 'keep.txt'), 'utf-8')).toBe('keep');
-            expect(await readFile(join(outDir, 'new.txt'), 'utf-8')).toBe('new');
+            expect(await readFile(join(outDir, 'new.ts'), 'utf-8')).toBe(signed());
         });
     });
 });

package/build/codegen/targets/_shared/write-files.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"write-files.test.js","sourceRoot":"","sources":["../../../../src/codegen/targets/_shared/write-files.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AACxE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAEtD,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,IAAI,MAAmC,CAAA;QAEvC,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QAChE,CAAC,CAAC,CAAA;QAEF,SAAS,CAAC,GAAG,EAAE;YACb,MAAM,CAAC,WAAW,EAAE,CAAA;QACtB,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;YACrF,MAAM,GAAG,GAAG,oCAAoC,CAAA;YAChD,MAAM,mBAAmB,CACvB;gBACE,EAAE,IAAI,EAAE,GAAG,GAAG,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE;gBACvC,EAAE,IAAI,EAAE,GAAG,GAAG,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE;aACrC,EACD,GAAG,EACH,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB,CAAA;YACD,MAAM,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,0BAA0B,GAAG,kBAAkB,CAAC,CAAA;YACpF,MAAM,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,0BAA0B,GAAG,kBAAkB,CAAC,CAAA;YACpF,mCAAmC;YACnC,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QACvD,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;YACnE,MAAM,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;YAC1E,MAAM,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,oCAAoC,CAAC,CAAA;QAC3E,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;YACnE,MAAM,mBAAmB,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;YACpF,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAY,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAC9D,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;QAC1F,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;YACrC,2BAA2B;YAC3B,MAAM,mBAAmB,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;YACpF,MAAM,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,2CAA2C,CAAC,CAAA;QAClF,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,IAAI,MAAc,CAAA;QAElB,UAAU,CAAC,KAAK,IAAI,EAAE;YACpB,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,mBAAmB,CAAC,CAAC,CAAA;QAC7D,CAAC,CAAC,CAAA;QAEF,SAAS,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;YACpD,MAAM,mBAAmB,CACvB;gBACE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC9C,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE;aAC9C,EACD,MAAM,CACP,CAAA;YACD,MAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACpE,MAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACrE,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACrD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;YAC1C,MAAM,mBAAmB,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,CAAC,CAAA;YAC/E,MAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAClE,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,6BAA6B;YAC7B,MAAM,KAAK,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YACxC,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;YAE5D,MAAM,mBAAmB,CACvB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EACpD,MAAM,EACN,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAA;YAED,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;YACxF,MAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC1E,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAChE,MAAM,KAAK,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YACxC,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YAE1D,MAAM,mBAAmB,CACvB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAChD,MAAM,CACP,CAAA;YAED,MAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACtE,MAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACtE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"write-files.test.js","sourceRoot":"","sources":["../../../../src/codegen/targets/_shared/write-files.test.ts"],"names":[],"mappings":"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"}

package/build/codegen/targets/kotlin/emit-scope-kotlin.js

@@ -1,5 +1,5 @@
 import { emitKotlinRoute } from './emit-route-kotlin.js';
-import { kotlinPackageDecl, kotlinSourceHashHeader, kotlinImports } from './format-kotlin.js';
+import { kotlinPackageDecl, kotlinSignatureHeader, kotlinSourceHashHeader, kotlinImports } from './format-kotlin.js';
 import { indent } from '../_shared/indent.js';
 import { pickDefined } from '../_shared/pick-defined.js';
 import { pascalCase } from '../_shared/pascal-case.js';
@@ -25,9 +25,10 @@ export function emitKotlinScope(group, opts, emitter, errorSchemas) {
         ? `object ${scopeName} {\n}`
         : `object ${scopeName} {\n${innerScope}\n}`;
     const importsBlock = kotlinImports(allImports);
+    const headerBlock = [kotlinSignatureHeader(), kotlinSourceHashHeader(opts.sourceHash)].join('\n');
     const parts = [
         kotlinPackageDecl(opts.kotlinPackage),
-        kotlinSourceHashHeader(opts.sourceHash),
+        headerBlock,
         importsBlock,
         scopeBlock,
     ].filter((p) => p.length > 0);

package/build/codegen/targets/kotlin/emit-scope-kotlin.js.map

@@ -1 +1 @@
-{"version":3,"file":"emit-scope-kotlin.js","sourceRoot":"","sources":["../../../../src/codegen/targets/kotlin/emit-scope-kotlin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAsB,MAAM,wBAAwB,CAAA;AAC5E,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAC7F,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AActD,MAAM,UAAU,eAAe,CAC7B,KAAiB,EACjB,IAAsB,EACtB,OAAsB,EACtB,YAAkC;IAElC,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC5C,MAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,MAAM,WAAW,GAAa,EAAE,CAAA;IAChC,MAAM,cAAc,GAAa,EAAE,CAAA;IAEnC,MAAM,gBAAgB,GAAG,CAAC,YAAY,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,CAAU,CAAA;IAC3H,MAAM,SAAS,GAAkB,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAA;IAEpE,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjC,MAAM,CAAC,GAAG,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC,CAAA;QAClE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YACd,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;YAChC,SAAQ;QACV,CAAC;QACD,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAA;QAC7B,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,SAAS,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAA;QAClE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;IAED,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACtF,MAAM,UAAU,GAAG,UAAU,KAAK,EAAE;QAClC,CAAC,CAAC,UAAU,SAAS,OAAO;QAC5B,CAAC,CAAC,UAAU,SAAS,OAAO,UAAU,KAAK,CAAA;IAE7C,MAAM,YAAY,GAAG,aAAa,CAAC,UAAU,CAAC,CAAA;IAC9C,MAAM,KAAK,GAAG;QACZ,iBAAiB,CAAC,IAAI,CAAC,aAAa,CAAC;QACrC,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAC;QACvC,YAAY;QACZ,UAAU;KACX,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAE7B,OAAO,EAAE,QAAQ,EAAE,GAAG,SAAS,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,cAAc,EAAE,CAAA;AACzF,CAAC"}
+{"version":3,"file":"emit-scope-kotlin.js","sourceRoot":"","sources":["../../../../src/codegen/targets/kotlin/emit-scope-kotlin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAsB,MAAM,wBAAwB,CAAA;AAC5E,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACpH,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AActD,MAAM,UAAU,eAAe,CAC7B,KAAiB,EACjB,IAAsB,EACtB,OAAsB,EACtB,YAAkC;IAElC,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC5C,MAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,MAAM,WAAW,GAAa,EAAE,CAAA;IAChC,MAAM,cAAc,GAAa,EAAE,CAAA;IAEnC,MAAM,gBAAgB,GAAG,CAAC,YAAY,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,CAAU,CAAA;IAC3H,MAAM,SAAS,GAAkB,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAA;IAEpE,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjC,MAAM,CAAC,GAAG,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC,CAAA;QAClE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YACd,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;YAChC,SAAQ;QACV,CAAC;QACD,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAA;QAC7B,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,SAAS,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAA;QAClE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;IAED,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACtF,MAAM,UAAU,GAAG,UAAU,KAAK,EAAE;QAClC,CAAC,CAAC,UAAU,SAAS,OAAO;QAC5B,CAAC,CAAC,UAAU,SAAS,OAAO,UAAU,KAAK,CAAA;IAE7C,MAAM,YAAY,GAAG,aAAa,CAAC,UAAU,CAAC,CAAA;IAC9C,MAAM,WAAW,GAAG,CAAC,qBAAqB,EAAE,EAAE,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACjG,MAAM,KAAK,GAAG;QACZ,iBAAiB,CAAC,IAAI,CAAC,aAAa,CAAC;QACrC,WAAW;QACX,YAAY;QACZ,UAAU;KACX,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAE7B,OAAO,EAAE,QAAQ,EAAE,GAAG,SAAS,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,cAAc,EAAE,CAAA;AACzF,CAAC"}

package/build/codegen/targets/kotlin/format-kotlin.d.ts

@@ -1,3 +1,9 @@
 export declare function kotlinPackageDecl(pkg: string): string;
+/**
+ * Stable signature comment embedded at the top of every generated Kotlin file.
+ * Carries the version-agnostic `ts-procedures-codegen` token so the marker-based
+ * prune in `writeGeneratedFiles` can recognise generated Kotlin files as owned.
+ */
+export declare function kotlinSignatureHeader(): string;
 export declare function kotlinSourceHashHeader(hash: string): string;
 export declare function kotlinImports(imports: string[]): string;

package/build/codegen/targets/kotlin/format-kotlin.js

@@ -1,6 +1,15 @@
+import { CODEGEN_SIGNATURE } from '../../constants.js';
 export function kotlinPackageDecl(pkg) {
     return `package ${pkg}`;
 }
+/**
+ * Stable signature comment embedded at the top of every generated Kotlin file.
+ * Carries the version-agnostic `ts-procedures-codegen` token so the marker-based
+ * prune in `writeGeneratedFiles` can recognise generated Kotlin files as owned.
+ */
+export function kotlinSignatureHeader() {
+    return `// ${CODEGEN_SIGNATURE} — do not edit`;
+}
 export function kotlinSourceHashHeader(hash) {
     return `// Source hash: ${hash}`;
 }

package/build/codegen/targets/kotlin/format-kotlin.js.map

@@ -1 +1 @@
-{"version":3,"file":"format-kotlin.js","sourceRoot":"","sources":["../../../../src/codegen/targets/kotlin/format-kotlin.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAAC,GAAW;IAC3C,OAAO,WAAW,GAAG,EAAE,CAAA;AACzB,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,IAAY;IACjD,OAAO,mBAAmB,IAAI,EAAE,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAiB;IAC7C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IACnC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IAClD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACpD,CAAC"}
+{"version":3,"file":"format-kotlin.js","sourceRoot":"","sources":["../../../../src/codegen/targets/kotlin/format-kotlin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAEtD,MAAM,UAAU,iBAAiB,CAAC,GAAW;IAC3C,OAAO,WAAW,GAAG,EAAE,CAAA;AACzB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB;IACnC,OAAO,MAAM,iBAAiB,gBAAgB,CAAA;AAChD,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,IAAY;IACjD,OAAO,mBAAmB,IAAI,EAAE,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAiB;IAC7C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IACnC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IAClD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACpD,CAAC"}

package/build/codegen/targets/kotlin/format-kotlin.test.js

@@ -1,9 +1,16 @@
 import { describe, expect, it } from 'vitest';
-import { kotlinPackageDecl, kotlinSourceHashHeader, kotlinImports, } from './format-kotlin.js';
+import { kotlinPackageDecl, kotlinSignatureHeader, kotlinSourceHashHeader, kotlinImports, } from './format-kotlin.js';
+import { CODEGEN_SIGNATURE } from '../../constants.js';
 describe('format-kotlin', () => {
     it('emits a package declaration', () => {
         expect(kotlinPackageDecl('com.example.api')).toBe('package com.example.api');
     });
+    it('emits a signature header line carrying the package token', () => {
+        const header = kotlinSignatureHeader();
+        expect(header).toBe(`// ${CODEGEN_SIGNATURE} — do not edit`);
+        // The marker-based prune depends on this token being present.
+        expect(header).toContain(CODEGEN_SIGNATURE);
+    });
     it('emits a source-hash header line', () => {
         expect(kotlinSourceHashHeader('abc123')).toBe('// Source hash: abc123');
     });

package/build/codegen/targets/kotlin/format-kotlin.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"format-kotlin.test.js","sourceRoot":"","sources":["../../../../src/codegen/targets/kotlin/format-kotlin.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EACL,iBAAiB,EACjB,sBAAsB,EACtB,aAAa,GACd,MAAM,oBAAoB,CAAA;AAE3B,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;IAC9E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;IACzE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,CAAC,aAAa,CAAC,CAAC,oCAAoC,EAAE,kCAAkC,EAAE,oCAAoC,CAAC,CAAC,CAAC,CAAC,IAAI,CAC1I,oFAAoF,CACrF,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"format-kotlin.test.js","sourceRoot":"","sources":["../../../../src/codegen/targets/kotlin/format-kotlin.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,sBAAsB,EACtB,aAAa,GACd,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAEtD,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;IAC9E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,MAAM,GAAG,qBAAqB,EAAE,CAAA;QACtC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,iBAAiB,gBAAgB,CAAC,CAAA;QAC5D,8DAA8D;QAC9D,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;IACzE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,CAAC,aAAa,CAAC,CAAC,oCAAoC,EAAE,kCAAkC,EAAE,oCAAoC,CAAC,CAAC,CAAC,CAAC,IAAI,CAC1I,oFAAoF,CACrF,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/build/codegen/targets/swift/format-swift.js

@@ -1,5 +1,8 @@
+import { CODEGEN_SIGNATURE } from '../../constants.js';
 export function swiftHeader(sourceHash) {
-    return `// Generated by ts-procedures-codegen — do not edit.\n// Source hash: ${sourceHash}`;
+    // The marker-based prune in `writeGeneratedFiles` relies on CODEGEN_SIGNATURE
+    // appearing in this header.
+    return `// Generated by ${CODEGEN_SIGNATURE} — do not edit.\n// Source hash: ${sourceHash}`;
 }
 export function swiftImports(imports) {
     if (imports.length === 0)

package/build/codegen/targets/swift/format-swift.js.map

@@ -1 +1 @@
-{"version":3,"file":"format-swift.js","sourceRoot":"","sources":["../../../../src/codegen/targets/swift/format-swift.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,UAAkB;IAC5C,OAAO,yEAAyE,UAAU,EAAE,CAAA;AAC9F,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAiB;IAC5C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IACnC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IAClD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACpD,CAAC"}
+{"version":3,"file":"format-swift.js","sourceRoot":"","sources":["../../../../src/codegen/targets/swift/format-swift.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAEtD,MAAM,UAAU,WAAW,CAAC,UAAkB;IAC5C,8EAA8E;IAC9E,4BAA4B;IAC5B,OAAO,mBAAmB,iBAAiB,oCAAoC,UAAU,EAAE,CAAA;AAC7F,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAiB;IAC5C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IACnC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IAClD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACpD,CAAC"}

package/docs/ai-agent-setup.md

@@ -22,7 +22,7 @@ npx ts-procedures-setup copilot      # GitHub Copilot only
 
 | Tool | Files | Auto-updates? |
 |------|-------|---------------|
-| **Claude Code** | `.claude/skills/ts-procedures/`, `.claude/skills/ts-procedures-scaffold/`, `.claude/skills/ts-procedures-review/`, `.claude/agents/ts-procedures-architect.md` | Yes |
+| **Claude Code** | `.claude/skills/ts-procedures/` (single skill — reference + `review`/`scaffold` modes + Kotlin/Swift codegen), `.claude/agents/ts-procedures-architect.md` | Yes |
 | **Cursor** | `.cursorrules` (marker-based section) | Yes |
 | **GitHub Copilot** | `.github/copilot-instructions.md` (marker-based section) | Yes |
 
@@ -34,9 +34,10 @@ After initial setup, rules are automatically refreshed on every `npm install` or
 
 Once installed, Claude Code gets:
 
-- **Framework reference skill** — `ts-procedures` with core API, schema system, error handling, and decision framework (auto-discovered by Claude Code)
-- **Scaffold skill** — `/ts-procedures-scaffold <type> <Name>` generates procedures, streams, and HTTP setups with correct patterns
-- **Review skill** — `/ts-procedures-review <path>` checks code against a 60+ item checklist
+- **Unified `ts-procedures` skill** — one skill with three modes selected by the first word of its arguments:
+  - *Reference* (no argument) — core API, schema system, error handling, decision framework, plus Kotlin/Swift client-codegen reference (auto-discovered by Claude Code)
+  - *Scaffold* — `/ts-procedures scaffold <type> <Name>` generates procedures, streams, and HTTP setups with correct patterns
+  - *Review* — `/ts-procedures review <path>` checks code against a 60+ item checklist
 - **Architecture agent** — `ts-procedures-architect` helps plan procedure structure, schema design, and HTTP implementation choices
 
 ## CLI Options
@@ -54,8 +55,6 @@ The `.claude/` files are auto-generated and regenerated on `npm install`. You ca
 ```gitignore
 # Auto-generated AI agent rules (regenerated on npm install)
 .claude/skills/ts-procedures/
-.claude/skills/ts-procedures-scaffold/
-.claude/skills/ts-procedures-review/
 .claude/agents/ts-procedures-*.md
 ```
 

package/docs/client-and-codegen.md

@@ -99,7 +99,7 @@ generated/
 | `--array-item-naming <value>` | Postfix for array item type names (ignored with `--no-namespace-types`) | Off |
 | `--uncountable-words <list>` | Comma-separated words to skip singularization (ignored with `--no-namespace-types`) | Off |
 | `--service-name <name>` | Names the service namespace and binding factory (e.g. `Auth` → `export namespace Auth` + `createAuthBindings`). Also prefixes `${Name}Errors` and `${Name}ProcedureErrorUnion` in `_errors.ts`. | `Api` |
-| `--clean-out-dir` / `--no-clean-out-dir` | Recursively remove `--out <dir>` before writing so stale scope files are pruned. Skipped under `--dry-run`. | Off |
+| `--clean-out-dir` / `--no-clean-out-dir` | Prune orphaned generated files from `--out <dir>` before writing — files carrying the `ts-procedures-codegen` signature that this run no longer emits (e.g. a deleted scope). Hand-written files (no signature) are never removed, and subdirectories are left untouched. Skipped under `--dry-run`. Pass `--no-clean-out-dir` to opt out. | **On** |
 
 > **Note:** ajsc formatting options (`--enum-style`, `--depluralize`, `--array-item-naming`, `--uncountable-words`) only take effect in namespace mode (the default). With `--no-namespace-types`, all types are inlined and these options have no effect.
 >
@@ -407,7 +407,7 @@ await generateClient({
   namespaceTypes: true,   // CLI defaults to true; programmatic API requires explicit opt-in
   selfContained: true,    // CLI defaults to true; programmatic API requires explicit opt-in
   dryRun: false,          // optional
-  cleanOutDir: false,     // optional — when true, recursively removes outDir before writing
+  cleanOutDir: true,      // optional — DEFAULT; prunes orphaned generated files (signed by ts-procedures-codegen) that this run no longer emits; never touches hand-written files. Set false to opt out.
   ajsc: {                 // optional — ajsc TypescriptConverter options
     jsdoc: true,          // CLI defaults to true; programmatic API requires explicit opt-in
     enumStyle: 'union',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-procedures",
-  "version": "8.1.1",
+  "version": "8.2.1",
   "description": "A TypeScript RPC framework that creates type-safe, schema-validated procedure calls with a single function definition. Define your procedures once and get full type inference, runtime validation, and framework integration hooks.",
   "main": "build/exports.js",
   "types": "build/exports.d.ts",

package/src/codegen/bin/cli.test.ts

@@ -203,9 +203,9 @@ describe('parseArgs', () => {
     expect(result.cleanOutDir).toBe(true)
   })
 
-  it('defaults cleanOutDir to false when not provided', () => {
+  it('defaults cleanOutDir to true when not provided', () => {
     const result = parseArgs(['--url', 'http://x.com/docs', '--out', './out'])
-    expect(result.cleanOutDir).toBe(false)
+    expect(result.cleanOutDir).toBe(true)
   })
 
   it('parses --no-clean-out-dir flag', () => {

package/src/codegen/bin/cli.ts

@@ -176,7 +176,7 @@ export function parseArgs(argv: string[], config?: CodegenConfig): ParsedArgs {
   let namespaceTypes = config?.namespaceTypes ?? true
   let selfContained = config?.selfContained ?? true
   let serviceName: string | undefined = config?.serviceName
-  let cleanOutDir = config?.cleanOutDir ?? false
+  let cleanOutDir = config?.cleanOutDir ?? true
   let target: 'ts' | 'kotlin' | 'swift' | undefined = config?.target
   let kotlinPackage: string | undefined = config?.kotlin?.package
   let kotlinSerializer: 'kotlinx' | 'none' | undefined = config?.kotlin?.serializer

package/src/codegen/constants.ts

@@ -1 +1,10 @@
-export const CODEGEN_HEADER = '// Auto-generated by ts-procedures-codegen — do not edit'
+import pkg from '../../package.json' with { type: 'json' }
+
+/**
+ * Stable, version-agnostic token embedded in every generated file (across all
+ * targets). The marker-based prune in `writeGeneratedFiles` uses this to tell
+ * generator-owned files apart from hand-written ones — so it must NOT include
+ * the package version (an orphan left by an older release must still match).
+ */
+export const CODEGEN_SIGNATURE = 'ts-procedures-codegen'
+export const CODEGEN_HEADER = `// Auto-generated by ${CODEGEN_SIGNATURE} (v${pkg.version}) — do not edit`

package/src/codegen/e2e.test.ts

@@ -476,7 +476,7 @@ describe('E2E: generateClient full pipeline', () => {
 
     for (const file of ['users.ts', 'events.ts', 'index.ts', '_errors.ts']) {
       const content = readFileSync(join(tmpDir, file), 'utf-8')
-      expect(content).toContain('// Auto-generated by ts-procedures-codegen — do not edit')
+      expect(content).toContain('// Auto-generated by ts-procedures-codegen')
     }
   })
 

package/src/codegen/emit-errors.test.ts

@@ -109,7 +109,7 @@ describe('emitErrorsFile', () => {
 
   it('includes the auto-generated header comment', async () => {
     const result = await emitErrorsFile([procedureErrorDoc])
-    expect(result).toContain('// Auto-generated by ts-procedures-codegen — do not edit')
+    expect(result).toContain('// Auto-generated by ts-procedures-codegen')
   })
 
   it('returns undefined when no errors have schemas', async () => {

package/src/codegen/emit-index.test.ts

@@ -31,7 +31,7 @@ const adminUsersGroup: ScopeGroup = {
 describe('emitIndexFile', () => {
   it('includes the auto-generated header comment', () => {
     const output = emitIndexFile([usersGroup])
-    expect(output).toContain('// Auto-generated by ts-procedures-codegen — do not edit')
+    expect(output).toContain('// Auto-generated by ts-procedures-codegen')
   })
 
   it('imports createClient as a value and client types for the factory', () => {

package/src/codegen/emit-scope.test.ts

@@ -271,7 +271,7 @@ describe('emitScopeFile', () => {
   describe('RPC scope', () => {
     it('includes the auto-generated header comment', async () => {
       const output = await emitScopeFile(rpcGroup)
-      expect(output).toContain('// Auto-generated by ts-procedures-codegen — do not edit')
+      expect(output).toContain('// Auto-generated by ts-procedures-codegen')
     })
 
     it('imports ClientInstance and ProcedureCallOptions but not TypedStream', async () => {

package/src/codegen/pipeline.test.ts

@@ -7,6 +7,7 @@ import { mkdirSync, rmSync, readFileSync, existsSync, writeFileSync } from 'node
 import { join } from 'node:path'
 import { tmpdir } from 'node:os'
 import type { DocEnvelope } from '../implementations/types.js'
+import { CODEGEN_HEADER } from './constants.js'
 
 // ---------------------------------------------------------------------------
 // Fixtures
@@ -140,7 +141,7 @@ describe('generateClient pipeline', () => {
 
     for (const file of ['users.ts', 'billing.ts', 'index.ts']) {
       const content = readFileSync(join(tmpDir, file), 'utf-8')
-      expect(content).toContain('// Auto-generated by ts-procedures-codegen — do not edit')
+      expect(content).toContain('// Auto-generated by ts-procedures-codegen')
     }
   })
 
@@ -172,7 +173,7 @@ describe('generateClient pipeline', () => {
     expect(paths).toContain(join(dryDir, 'billing.ts'))
     expect(paths).toContain(join(dryDir, 'index.ts'))
     for (const file of files) {
-      expect(file.code).toContain('// Auto-generated by ts-procedures-codegen — do not edit')
+      expect(file.code).toContain('// Auto-generated by ts-procedures-codegen')
     }
   })
 
@@ -186,8 +187,8 @@ describe('generateClient pipeline', () => {
     // Verify both files have auto-generated header and source hash
     const typesFile = files.find((f) => f.path.endsWith('_types.ts'))!
     const clientFile = files.find((f) => f.path.endsWith('_client.ts'))!
-    expect(typesFile.code).toContain('// Auto-generated by ts-procedures-codegen — do not edit')
-    expect(clientFile.code).toContain('// Auto-generated by ts-procedures-codegen — do not edit')
+    expect(typesFile.code).toContain('// Auto-generated by ts-procedures-codegen')
+    expect(clientFile.code).toContain('// Auto-generated by ts-procedures-codegen')
     const typesLines = typesFile.code.split('\n')
     expect(typesLines[1]).toMatch(/^\/\/ Source hash: [a-f0-9]{32}$/)
     const clientLines = clientFile.code.split('\n')
@@ -290,30 +291,58 @@ describe('generateClient pipeline', () => {
     expect(content).not.toContain('createScopeBindings')
   })
 
-  it('cleanOutDir: true removes stale files before writing', async () => {
+  it('cleanOutDir: true removes orphaned generated files before writing', async () => {
     tmpDir = makeTmpDir()
-    const stale = join(tmpDir, 'stale.ts')
-    writeFileSync(stale, '// stale', 'utf-8')
-    expect(existsSync(stale)).toBe(true)
+    // A previously-generated scope file (carries the package signature) that
+    // this envelope no longer emits.
+    const orphan = join(tmpDir, 'old-scope.ts')
+    writeFileSync(orphan, `${CODEGEN_HEADER}\n\nexport const gone = 1\n`, 'utf-8')
+    expect(existsSync(orphan)).toBe(true)
 
     await generateClient({ envelope, outDir: tmpDir, cleanOutDir: true })
 
-    expect(existsSync(stale)).toBe(false)
+    expect(existsSync(orphan)).toBe(false)
     expect(existsSync(join(tmpDir, 'index.ts'))).toBe(true)
     expect(existsSync(join(tmpDir, 'users.ts'))).toBe(true)
   })
 
-  it('cleanOutDir: false (default) leaves unrelated files in place', async () => {
+  it('cleanOutDir: true never removes hand-written files lacking the signature', async () => {
     tmpDir = makeTmpDir()
+    const handWritten = join(tmpDir, 'hand-written.ts')
+    writeFileSync(handWritten, 'export const mine = 1\n', 'utf-8')
+
+    await generateClient({ envelope, outDir: tmpDir, cleanOutDir: true })
+
+    expect(existsSync(handWritten)).toBe(true)
+    expect(existsSync(join(tmpDir, 'index.ts'))).toBe(true)
+  })
+
+  it('prunes orphaned generated files by default (cleanOutDir defaults to true)', async () => {
+    tmpDir = makeTmpDir()
+    const orphan = join(tmpDir, 'old-scope.ts')
+    writeFileSync(orphan, `${CODEGEN_HEADER}\n\nexport const gone = 1\n`, 'utf-8')
+    // Hand-written file is still safe even with pruning on by default.
     const keep = join(tmpDir, 'keep.ts')
     writeFileSync(keep, '// keep', 'utf-8')
 
     await generateClient({ envelope, outDir: tmpDir })
 
+    expect(existsSync(orphan)).toBe(false)
     expect(existsSync(keep)).toBe(true)
     expect(existsSync(join(tmpDir, 'index.ts'))).toBe(true)
   })
 
+  it('cleanOutDir: false opts out of pruning, leaving orphaned generated files', async () => {
+    tmpDir = makeTmpDir()
+    const orphan = join(tmpDir, 'old-scope.ts')
+    writeFileSync(orphan, `${CODEGEN_HEADER}\n\nexport const gone = 1\n`, 'utf-8')
+
+    await generateClient({ envelope, outDir: tmpDir, cleanOutDir: false })
+
+    expect(existsSync(orphan)).toBe(true)
+    expect(existsSync(join(tmpDir, 'index.ts'))).toBe(true)
+  })
+
   it('cleanOutDir works when outDir does not exist', async () => {
     tmpDir = makeTmpDir()
     const nested = join(tmpDir, 'nested', 'missing')

package/src/codegen/pipeline.ts

@@ -43,7 +43,7 @@ export type { GeneratedFile } from './targets/_shared/write-files.js'
  * `_shared/write-files.ts`).
  */
 export async function runPipeline(options: PipelineOptions): Promise<GeneratedFile[]> {
-  const { envelope, outDir, ajsc: ajscOpts, dryRun = false, namespaceTypes = false, selfContained = false, cleanOutDir = false } = options
+  const { envelope, outDir, ajsc: ajscOpts, dryRun = false, namespaceTypes = false, selfContained = false, cleanOutDir = true } = options
   const serviceName = options.serviceName ?? 'Api'
   validateServiceName(serviceName)