Merge branch 'main' into feat/update-vitest

* main: (37 commits)
  Version Packages (Effect-TS#5869)
  Fix the arbitrary generator for BigDecimal to allow negative scales (Effect-TS#5875)
  Widen otel logs peer dep range (Effect-TS#5863)
  Ensure Devtools Tracer does not cut off span options (Effect-TS#5864)
  Version Packages (Effect-TS#5848)
  Update generated OpenAI schema definitions (Effect-TS#5850)
  Update generated OpenRouter definitions and fix logprob schema (Effect-TS#5849)
  add Workflow.scope, a seperate Scope that only closes on completion (Effect-TS#5846)
  ensure PersistedQueue memory driver removes items (Effect-TS#5847)
  Version Packages (Effect-TS#5838)
  support idempotent offers to PersistedQueue (Effect-TS#5837)
  Version Packages (Effect-TS#5836)
  consider clean http interrupts (already responded) as successful responses (Effect-TS#5835)
  Version Packages (Effect-TS#5830)
  reset redis staging area on a schedule for PersistedQueue (Effect-TS#5829)
  Version Packages (Effect-TS#5828)
  add TestRunner & SingleRunner modules (Effect-TS#5827)
  Version Packages (Effect-TS#5825)
  improve ordering guarantees for SqlPersistedQueue (Effect-TS#5824)
  Version Packages (Effect-TS#5822)
  ...

# Conflicts:
#	pnpm-lock.yaml

Author: Hoishin

.github/actions/setup/action.yml

@@ -5,6 +5,8 @@ inputs:
     description: The version of Node.js to install
     required: true
     default: 23.7.0
+  registry-url:
+    description: Optional registry to set up for auth.
 
 runs:
   using: composite
@@ -16,6 +18,7 @@ runs:
       with:
         cache: pnpm
         node-version: ${{ inputs.node-version }}
+        registry-url: ${{ inputs.registry-url }}
     - name: Install dependencies
       shell: bash
       run: pnpm install

.github/workflows/release.yml

@@ -22,11 +22,14 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install dependencies
         uses: ./.github/actions/setup
+        with:
+          registry-url: "https://registry.npmjs.org"
+      - name: Upgrade npm for OIDC support
+        run: npm install -g npm@latest
       - name: Create Release Pull Request or Publish
         uses: changesets/action@v1
         with:
           version: pnpm changeset-version
           publish: pnpm changeset-publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

packages/ai/ai/src/Prompt.ts

@@ -1788,6 +1788,7 @@ export const setSystem: {
  *   prompt,
  *   "You are a helpful assistant. "
  * )
+ * // result content: "You are a helpful assistant. You are an expert in programming."
  * ```
  *
  * @since 1.0.0
@@ -1797,18 +1798,19 @@ export const prependSystem: {
   (content: string): (self: Prompt) => Prompt
   (self: Prompt, content: string): Prompt
 } = dual(2, (self: Prompt, content: string): Prompt => {
-  const messages: Array<Message> = []
+  let system: SystemMessage | undefined = undefined
   for (const message of self.content) {
     if (message.role === "system") {
-      const system = makeMessage("system", {
+      system = makeMessage("system", {
         content: content + message.content
       })
-      messages.push(system)
-    } else {
-      messages.push(message)
+      break
     }
   }
-  return makePrompt(messages)
+  if (Predicate.isUndefined(system)) {
+    system = makeMessage("system", { content })
+  }
+  return makePrompt([system, ...self.content])
 })
 
 /**
@@ -1824,7 +1826,7 @@ export const prependSystem: {
  *
  * const systemPrompt = Prompt.make([{
  *   role: "system",
- *   content: "You are a helpful assistant."
+ *   content: "You are an expert in programming."
  * }])
  *
  * const userPrompt = Prompt.make("Hello, world!")
@@ -1833,8 +1835,9 @@ export const prependSystem: {
  *
  * const replaced = Prompt.appendSystem(
  *   prompt,
- *   " You are an expert in programming."
+ *   " You are a helpful assistant."
  * )
+ * // result content: "You are an expert in programming. You are a helpful assistant."
  * ```
  *
  * @since 1.0.0
@@ -1844,16 +1847,17 @@ export const appendSystem: {
   (content: string): (self: Prompt) => Prompt
   (self: Prompt, content: string): Prompt
 } = dual(2, (self: Prompt, content: string): Prompt => {
-  const messages: Array<Message> = []
+  let system: SystemMessage | undefined = undefined
   for (const message of self.content) {
     if (message.role === "system") {
-      const system = makeMessage("system", {
+      system = makeMessage("system", {
         content: message.content + content
       })
-      messages.push(system)
-    } else {
-      messages.push(message)
+      break
     }
   }
-  return makePrompt(messages)
+  if (Predicate.isUndefined(system)) {
+    system = makeMessage("system", { content })
+  }
+  return makePrompt([system, ...self.content])
 })

packages/ai/ai/test/Prompt.test.ts

@@ -99,4 +99,101 @@ describe("Prompt", () => {
       assert.deepStrictEqual(merged, prompt)
     })
   })
+
+  describe("appendSystem", () => {
+    it("should append text to existing system message", () => {
+      const prompt = Prompt.make([
+        { role: "system", content: "You are an expert in programming." },
+        { role: "user", content: "Hello, world!" }
+      ])
+
+      const result = Prompt.appendSystem(prompt, " You are a helpful assistant.")
+
+      assert.deepStrictEqual(
+        result.content[0],
+        Prompt.makeMessage("system", {
+          content: "You are an expert in programming. You are a helpful assistant."
+        })
+      )
+    })
+
+    it("should create a new system message if none exists", () => {
+      const prompt = Prompt.make([
+        { role: "user", content: "Hello, world!" }
+      ])
+
+      const result = Prompt.appendSystem(prompt, "You are a helpful assistant.")
+
+      assert.deepStrictEqual(
+        result.content[0],
+        Prompt.makeMessage("system", {
+          content: "You are a helpful assistant."
+        })
+      )
+    })
+
+    it("should work with empty prompt", () => {
+      const prompt = Prompt.empty
+
+      const result = Prompt.appendSystem(prompt, "You are a helpful assistant.")
+
+      assert.deepStrictEqual(
+        result.content[0],
+        Prompt.makeMessage("system", { content: "You are a helpful assistant." })
+      )
+    })
+  })
+
+  describe("prependSystem", () => {
+    it("should prepend text to existing system message", () => {
+      const prompt = Prompt.make([
+        {
+          role: "system",
+          content: "You are an expert in programming."
+        },
+        {
+          role: "user",
+          content: "Hello, world!"
+        }
+      ])
+
+      const result = Prompt.prependSystem(prompt, "You are a helpful assistant. ")
+
+      assert.deepStrictEqual(
+        result.content[0],
+        Prompt.makeMessage("system", {
+          content: "You are a helpful assistant. You are an expert in programming."
+        })
+      )
+    })
+
+    it("should create a new system message if none exists", () => {
+      const prompt = Prompt.make([
+        {
+          role: "user",
+          content: "Hello, world!"
+        }
+      ])
+
+      const result = Prompt.prependSystem(prompt, "You are a helpful assistant.")
+
+      assert.deepStrictEqual(
+        result.content[0],
+        Prompt.makeMessage("system", {
+          content: "You are a helpful assistant."
+        })
+      )
+    })
+
+    it("should work with empty prompt", () => {
+      const prompt = Prompt.empty
+
+      const result = Prompt.prependSystem(prompt, "You are a helpful assistant.")
+
+      assert.deepStrictEqual(
+        result.content[0],
+        Prompt.makeMessage("system", { content: "You are a helpful assistant." })
+      )
+    })
+  })
 })

packages/ai/openai/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @effect/ai-openai
 
+## 0.36.0
+
+### Minor Changes
+
+- [#5850](https://github.com/Effect-TS/effect/pull/5850) [`1ddd4e4`](https://github.com/Effect-TS/effect/commit/1ddd4e477a9677fb3820f80450a378d3550d31a7) Thanks @IMax153! - Update the generated OpenAI schema definitions
+
+### Patch Changes
+
+- Updated dependencies [[`96c9537`](https://github.com/Effect-TS/effect/commit/96c9537f73a87a651c348488bdce7efbfd8360d1)]:
+  - @effect/experimental@0.57.10
+
 ## 0.35.0
 
 ### Patch Changes

packages/ai/openai/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@effect/ai-openai",
   "type": "module",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "license": "MIT",
   "description": "Effect modules for working with AI apis",
   "homepage": "https://effect.website",

packages/ai/openai/scripts/generated.patch

@@ -1,23 +1,16 @@
 diff --git a/packages/ai/openai/src/Generated.ts b/packages/ai/openai/src/Generated.ts
-index bff596c3d..938a26f44 100644
+index 1f2580576..a24c4f359 100644
 --- a/packages/ai/openai/src/Generated.ts
 +++ b/packages/ai/openai/src/Generated.ts
-@@ -897,7 +897,7 @@ export class CreateTranscriptionResponseVerboseJson
+@@ -915,9 +915,9 @@ export class CreateTranscriptionResponseVerboseJson
  {}
 
- export class CreateTranscription200
--  extends S.Union(CreateTranscriptionResponseJson, CreateTranscriptionResponseVerboseJson)
-+  extends S.Union(CreateTranscriptionResponseVerboseJson, CreateTranscriptionResponseJson)
- {}
- 
- export class CreateTranslationRequestModelEnum extends S.Literal("whisper-1") {}
-@@ -4844,7 +4844,8 @@ export class Includable extends S.Literal(
-   "file_search_call.results",
-   "message.input_image.image_url",
-   "message.output_text.logprobs",
--  "reasoning.encrypted_content"
-+  "reasoning.encrypted_content",
-+  "web_search_call.action.sources"
+ export class CreateTranscription200 extends S.Union(
+-  CreateTranscriptionResponseJson,
++  CreateTranscriptionResponseVerboseJson,
+   CreateTranscriptionResponseDiarizedJson,
+-  CreateTranscriptionResponseVerboseJson
++  CreateTranscriptionResponseJson
  ) {}
 
- export class ListConversationItemsParams extends S.Struct({
+ export class CreateTranslationRequestModelEnum extends S.Literal("whisper-1") {}