From 66670378eb9a2dfe62dae60ea8d75255665935ad Mon Sep 17 00:00:00 2001 From: Harlan Wilton Date: Wed, 26 Aug 2026 21:46:20 +1000 Subject: [PATCH 1/2] chore(release): restore release command --- bump.config.ts | 20 +++++++++++ package.json | 18 +++++----- pnpm-lock.yaml | 83 +++++++++++++++++++++++++++++++++++++++------ pnpm-workspace.yaml | 1 + 4 files changed, 104 insertions(+), 18 deletions(-) create mode 100644 bump.config.ts diff --git a/bump.config.ts b/bump.config.ts new file mode 100644 index 00000000..7f2794e8 --- /dev/null +++ b/bump.config.ts @@ -0,0 +1,20 @@ +import { defineConfig } from 'bumpp' + +export default defineConfig({ + commit: 'chore(release): prepare {tag}', + files: [ + 'package.json', + 'packages/harness/package.json', + 'packages/cli-darwin-arm64/package.json', + 'packages/cli-darwin-x64/package.json', + 'packages/cli-linux-arm64-gnu/package.json', + 'packages/cli-linux-arm64-musl/package.json', + 'packages/cli-linux-x64-gnu/package.json', + 'packages/cli-linux-x64-musl/package.json', + 'packages/cli-win32-arm64-msvc/package.json', + 'packages/cli-win32-x64-msvc/package.json', + 'Cargo.toml', + 'Cargo.lock', + ], + noGitCheck: false, +}) diff --git a/package.json b/package.json index 1cfa9b36..1e79e08b 100644 --- a/package.json +++ b/package.json @@ -44,21 +44,23 @@ "test": "vitest", "test:js": "vitest run tests/loader && pnpm --filter skilld-protocol test:run && pnpm --filter skilld-harness test:run", "test:run": "pnpm test:js && cargo test --workspace", + "release": "pnpm build && bumpp", "prepack": "pnpm test:loader", "test:loader": "vitest run --config vitest.config.mjs" }, "optionalDependencies": { - "skilld-cli-darwin-arm64": "workspace:3.0.0-beta.1", - "skilld-cli-darwin-x64": "workspace:3.0.0-beta.1", - "skilld-cli-linux-arm64-gnu": "workspace:3.0.0-beta.1", - "skilld-cli-linux-arm64-musl": "workspace:3.0.0-beta.1", - "skilld-cli-linux-x64-gnu": "workspace:3.0.0-beta.1", - "skilld-cli-linux-x64-musl": "workspace:3.0.0-beta.1", - "skilld-cli-win32-arm64-msvc": "workspace:3.0.0-beta.1", - "skilld-cli-win32-x64-msvc": "workspace:3.0.0-beta.1" + "skilld-cli-darwin-arm64": "workspace:*", + "skilld-cli-darwin-x64": "workspace:*", + "skilld-cli-linux-arm64-gnu": "workspace:*", + "skilld-cli-linux-arm64-musl": "workspace:*", + "skilld-cli-linux-x64-gnu": "workspace:*", + "skilld-cli-linux-x64-musl": "workspace:*", + "skilld-cli-win32-arm64-msvc": "workspace:*", + "skilld-cli-win32-x64-msvc": "workspace:*" }, "devDependencies": { "@antfu/eslint-config": "catalog:dev-lint", + "bumpp": "catalog:", "eslint": "catalog:dev-lint", "vitest": "catalog:dev-test" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 99cd43c0..a63a997a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,6 +21,9 @@ catalogs: '@typescript/native': specifier: npm:typescript@7.0.2 version: 7.0.2 + bumpp: + specifier: ^12.2.1 + version: 12.2.1 openapi-typescript: specifier: ^7.13.0 version: 7.13.0 @@ -62,6 +65,9 @@ importers: '@antfu/eslint-config': specifier: catalog:dev-lint version: 9.3.0(@typescript-eslint/typescript-estree@8.66.0(supports-color@10.2.2)(typescript@6.0.3))(@typescript-eslint/utils@8.66.0(eslint@10.9.1(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(@typescript/typescript6@6.0.2)(@vue/compiler-sfc@3.5.27)(eslint@10.9.1(jiti@2.7.0)(supports-color@10.2.2))(supports-color@7.2.0)(vitest@4.1.11(@opentelemetry/api@1.9.0)(@types/node@26.3.0)(vite@7.3.1(@types/node@26.3.0)(jiti@2.7.0)(tsx@4.23.12)(yaml@2.9.0))) + bumpp: + specifier: 'catalog:' + version: 12.2.1 eslint: specifier: catalog:dev-lint version: 10.9.1(jiti@2.7.0)(supports-color@10.2.2) @@ -70,28 +76,28 @@ importers: version: 4.1.11(@opentelemetry/api@1.9.0)(@types/node@26.3.0)(vite@7.3.1(@types/node@26.3.0)(jiti@2.7.0)(tsx@4.23.12)(yaml@2.9.0)) optionalDependencies: skilld-cli-darwin-arm64: - specifier: workspace:3.0.0-beta.1 + specifier: workspace:* version: link:packages/cli-darwin-arm64 skilld-cli-darwin-x64: - specifier: workspace:3.0.0-beta.1 + specifier: workspace:* version: link:packages/cli-darwin-x64 skilld-cli-linux-arm64-gnu: - specifier: workspace:3.0.0-beta.1 + specifier: workspace:* version: link:packages/cli-linux-arm64-gnu skilld-cli-linux-arm64-musl: - specifier: workspace:3.0.0-beta.1 + specifier: workspace:* version: link:packages/cli-linux-arm64-musl skilld-cli-linux-x64-gnu: - specifier: workspace:3.0.0-beta.1 + specifier: workspace:* version: link:packages/cli-linux-x64-gnu skilld-cli-linux-x64-musl: - specifier: workspace:3.0.0-beta.1 + specifier: workspace:* version: link:packages/cli-linux-x64-musl skilld-cli-win32-arm64-msvc: - specifier: workspace:3.0.0-beta.1 + specifier: workspace:* version: link:packages/cli-win32-arm64-msvc skilld-cli-win32-x64-msvc: - specifier: workspace:3.0.0-beta.1 + specifier: workspace:* version: link:packages/cli-win32-x64-msvc packages/cli-darwin-arm64: {} @@ -773,6 +779,9 @@ packages: resolution: {integrity: sha512-4EDEmvxWtgsCnnVeBvtFIFZtUhPPt1+bA9JrSwU4Sa//6oKtzCSlGGXYJr44OD9aGISymbieJ4mCKHUygUDU+g==} engines: {node: '>=18'} + '@quansync/fs@1.0.0': + resolution: {integrity: sha512-4TJ3DFtlf1L5LDMaM6CanJ/0lckGNtJcMjQ1NAV6zDmA0tEHKZtxNKin8EgPaVX1YzljbxckyT2tJrpQKAtngQ==} + '@redocly/ajv@8.11.2': resolution: {integrity: sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==} @@ -1517,6 +1526,9 @@ packages: argparse@2.0.1: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} + args-tokenizer@0.3.0: + resolution: {integrity: sha512-xXAd7G2Mll5W8uo37GETpQ2VrE84M181Z7ugHFGQnJZ50M2mbOv0osSZ9VsSgPfJQ+LVG0prSi0th+ELMsno7Q==} + assertion-error@2.0.1: resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==} engines: {node: '>=12'} @@ -1552,6 +1564,11 @@ packages: resolution: {integrity: sha512-hMQUl2bUFG339QygPM97E+mc8OY1IAchORZxm4a/frcYwKzozMzRVDBwHW0NjOqGElLm2O37AVQE8ikxlZHrMQ==} engines: {node: '>=18.20'} + bumpp@12.2.1: + resolution: {integrity: sha512-8inGPx8PC/BaEOWhzfxrNHGj/x5Srt0EeJatAcTJ9N7AZpQG/HlH4kGp5JWbEL8zffYXI5iBkMjG8SHnJ9e/6g==} + engines: {node: ^22.18.0 || ^24.11.0 || >=26.0.0} + hasBin: true + c12@4.0.0-beta.5: resolution: {integrity: sha512-yWGCPCQGJeFq4R0mFg5HOhC3Rg+B0PCdM+ldXWUhughoGgeeq8/tjRmXh4/lmhKWyhf+KOFxB/JMXf0Yv1Fd5A==} peerDependencies: @@ -2210,6 +2227,9 @@ packages: resolution: {integrity: sha512-fjACeZ2chy9tiBakt5nU5SZhzk385pkSSfmhVvS13o4gqGiHVCNJXTNve8kqMeKv7A0L50mdaNUb7T8s+Egrnw==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} + jsonc-parser@3.3.1: + resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==} + katex@0.16.47: resolution: {integrity: sha512-Eeo8Ys1doU1z+x8AZsPpQu+p/QcZBI5PeOo7QGQdy2x2m0MU/hYagBbGOmXwr5KVbEfVuWv9LpnQWeehogurjg==} hasBin: true @@ -2561,6 +2581,9 @@ packages: quansync@0.2.11: resolution: {integrity: sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==} + quansync@1.0.0: + resolution: {integrity: sha512-5xZacEEufv3HSTPQuchrvV6soaiACMFnq1H8wkVioctoH3TRha9Sz66lOxRwPK/qZj7HPiSveih9yAyh98gvqA==} + quote-js-string@0.1.0: resolution: {integrity: sha512-Y3NoRtprEEZQD8RfxMCfS0ZTqc4e+i18OrXEXAvpM6TfC/3y+0L5rNbZiSnbBBEkDfFzbpd8o+cE8q3/anjMGA==} engines: {node: '>=22'} @@ -2785,6 +2808,12 @@ packages: ufo@1.6.4: resolution: {integrity: sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==} + unconfig-core@7.5.0: + resolution: {integrity: sha512-Su3FauozOGP44ZmKdHy2oE6LPjk51M/TRRjHv2HNCWiDvfvCoxC2lno6jevMA91MYAdCdwP05QnWdWpSbncX/w==} + + unconfig@7.5.0: + resolution: {integrity: sha512-oi8Qy2JV4D3UQ0PsopR28CzdQ3S/5A1zwsUwp/rosSbfhJ5z7b90bIyTwi/F7hCLD4SGcZVjDzd4XoUQcEanvA==} + undici-types@8.3.0: resolution: {integrity: sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==} @@ -3484,6 +3513,10 @@ snapshots: dependencies: tinyexec: 1.3.0 + '@quansync/fs@1.0.0': + dependencies: + quansync: 1.0.0 + '@redocly/ajv@8.11.2': dependencies: fast-deep-equal: 3.1.3 @@ -4122,6 +4155,8 @@ snapshots: argparse@2.0.1: {} + args-tokenizer@0.3.0: {} + assertion-error@2.0.1: {} balanced-match@1.0.2: {} @@ -4150,6 +4185,18 @@ snapshots: builtin-modules@5.3.0: {} + bumpp@12.2.1: + dependencies: + args-tokenizer: 0.3.0 + cac: 7.0.0 + jsonc-parser: 3.3.1 + package-manager-detector: 1.8.0 + tinyexec: 1.3.0 + tinyglobby: 0.2.17 + unconfig: 7.5.0 + verkit: 0.3.2 + yaml: 2.9.0 + c12@4.0.0-beta.5(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.3.1)(jiti@2.7.0)(magicast@0.5.4): dependencies: confbox: 0.2.4 @@ -4823,8 +4870,7 @@ snapshots: isexe@2.0.0: {} - jiti@2.7.0: - optional: true + jiti@2.7.0: {} js-levenshtein@1.1.6: {} @@ -4860,6 +4906,8 @@ snapshots: eslint-visitor-keys: 5.0.1 verkit: 0.3.2 + jsonc-parser@3.3.1: {} + katex@0.16.47: dependencies: commander: 8.3.0 @@ -5477,6 +5525,8 @@ snapshots: quansync@0.2.11: {} + quansync@1.0.0: {} + quote-js-string@0.1.0: {} rc9@3.0.1: @@ -5731,6 +5781,19 @@ snapshots: ufo@1.6.4: {} + unconfig-core@7.5.0: + dependencies: + '@quansync/fs': 1.0.0 + quansync: 1.0.0 + + unconfig@7.5.0: + dependencies: + '@quansync/fs': 1.0.0 + defu: 6.1.7 + jiti: 2.7.0 + quansync: 1.0.0 + unconfig-core: 7.5.0 + undici-types@8.3.0: {} undici@7.29.0: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index f0c5ec80..701a16ed 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -16,6 +16,7 @@ catalog: '@arethetypeswrong/cli': ^0.18.5 '@redocly/cli': ^2.47.0 '@typescript/native': npm:typescript@7.0.2 + bumpp: ^12.2.1 openapi-typescript: ^7.13.0 publint: ^0.3.24 typescript: npm:@typescript/typescript6@^6.0.2 From 2df3ded6035727cd8272df4d33b05ca1251948e3 Mon Sep 17 00:00:00 2001 From: Harlan Wilton Date: Wed, 26 Aug 2026 21:46:20 +1000 Subject: [PATCH 2/2] test(harness): accept provider sandbox sessions --- packages/harness/test/support/fakes.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/harness/test/support/fakes.ts b/packages/harness/test/support/fakes.ts index 0951315f..5e92ec10 100644 --- a/packages/harness/test/support/fakes.ts +++ b/packages/harness/test/support/fakes.ts @@ -78,7 +78,9 @@ export function createFakeHarness(settings: FakeHarnessOptions): { throw settings.failPrompt await settings.onPrompt({ options: promptOptions, - sandbox: options.sandboxSession.restricted(), + sandbox: 'restricted' in options.sandboxSession + ? options.sandboxSession.restricted() + : options.sandboxSession, workDir: options.sessionWorkDir, }) promptOptions.emit({ type: 'stream-start' })