Merge master into app attribution RFC

packages/llm/llm-pi-ai/README.md

@@ -9,7 +9,7 @@ DeepSeek adapter for the harness LLM seam backed by [`@earendil-works/pi-ai`](ht
 - pi-ai hands tool-call `arguments` around as **parsed objects**; the harness keeps raw JSON strings. The adapter patches replay payloads back to the original raw strings before sending them, and re-stringifies parsed output tool calls at `block-end`.
 - pi-ai reports failures as **in-stream error events** (it never throws mid-stream); these map to `finish {kind:'error'|'aborted'}` chunks — the protocol's other sanctioned error path besides throwing (which llm-deepseek uses).
 - pi-ai folds reasoning tokens into `usage.output`; there is no separate reasoning count to map.
-- pi-ai's options omit some DeepSeek/OpenAI-compatible details; the adapter uses its `onPayload` hook to preserve the harness contract (`stop`, per-tool `strict`, omitted reasoning effort, raw replayed tool arguments).
+- pi-ai's options omit some DeepSeek/OpenAI-compatible details; the adapter uses its `onPayload` hook to preserve the harness contract (`stop`, scrubbing pi-ai's own per-tool `strict` default — the hand-rolled twin sends no such field — omitted reasoning effort, raw replayed tool arguments).
 
 ## Config
 
@@ -35,7 +35,7 @@ pi-ai declares the openai/anthropic/google/mistral/AWS SDKs as install-time depe
 
 ## Limitations
 
-Same MVP contract as llm-deepseek: `prefill` throws `UNSUPPORTED`, images are not representable, `tool_choice` is not mapped.
+Same MVP contract as llm-deepseek: `tool_choice` is not mapped.
 
 ## Testing
 

packages/llm/llm-pi-ai/src/adapter.ts

@@ -13,9 +13,9 @@
 
 import { stream as piStream } from '@earendil-works/pi-ai'
 import type { Model } from '@earendil-works/pi-ai'
-import { attributionHeaders, LlmAdapter, LlmError } from '@deepseek-ai/dsh-llm'
+import { attributionHeaders, LlmAdapter } from '@deepseek-ai/dsh-llm'
 import { CallId } from '@deepseek-ai/dsh-llm'
-import type { GenerateOptions, StreamChunk, ToolSchema } from '@deepseek-ai/dsh-llm'
+import type { GenerateOptions, StreamChunk } from '@deepseek-ai/dsh-llm'
 import { toPiContext, toStreamChunks } from './convert.ts'
 
 /** Reasoning levels surfaced by this adapter (DeepSeek wire: high|max). */
@@ -61,7 +61,7 @@ export function buildModel(modelId: string, options: PiAiAdapterOptions): Model<
 }
 
 type Payload = {
-  tools?: { function?: { name?: unknown; strict?: unknown } }[]
+  tools?: { function?: { strict?: unknown } }[]
   messages?: {
     role?: unknown
     tool_calls?: { id?: unknown; function?: { arguments?: unknown } }[]
@@ -81,10 +81,6 @@ function rawToolArguments(options: GenerateOptions): Map<CallId, string> {
   return raw
 }
 
-function strictByToolName(tools: ToolSchema[] | undefined): Map<string, boolean | undefined> {
-  return new Map((tools ?? []).map(tool => [tool.name, tool.strict]))
-}
-
 function patchPayload(payload: unknown, options: GenerateOptions, reasoning: PiAiReasoning | undefined): unknown {
   /* v8 ignore next -- pi-ai onPayload always receives an object; tolerate unusual future hooks defensively */
   if (typeof payload !== 'object' || payload === null) return payload
@@ -97,16 +93,13 @@ function patchPayload(payload: unknown, options: GenerateOptions, reasoning: PiA
     body.stop = options.stop
   }
 
-  const strictByName = strictByToolName(options.tools)
+  // pi-ai stamps its own `strict` default on every serialized tool; the
+  // harness tool contract has no strict field and the hand-rolled twin sends
+  // none, so scrub it for wire parity.
   for (const tool of body.tools ?? []) {
     /* v8 ignore next -- malformed pi-ai payload guard: real tool entries always carry function */
     if (tool.function === undefined) continue
-    const name = tool.function.name
-    /* v8 ignore next -- malformed pi-ai payload guard: real function entries always carry a string name */
-    if (typeof name !== 'string') continue
-    const strict = strictByName.get(name)
-    if (strict === undefined) delete tool.function.strict
-    else tool.function.strict = strict
+    delete tool.function.strict
   }
 
   const rawById = rawToolArguments(options)
@@ -131,9 +124,9 @@ function patchPayload(payload: unknown, options: GenerateOptions, reasoning: PiA
  *
  * Implementation notes:
  * - `onPayload` patches provider payload details pi-ai cannot express directly:
- *   stop sequences, per-tool strict, omitted reasoning effort, and raw replayed
- *   tool-call arguments.
- * - `prefill` throws UNSUPPORTED (same contract as dsh-llm-deepseek).
+ *   stop sequences, scrubbing pi-ai's own per-tool `strict` default (the
+ *   hand-rolled twin sends no such field), omitted reasoning effort, and raw
+ *   replayed tool-call arguments.
  * - pi-ai reports request failures as in-stream error events; convert.ts
  *   maps them to `finish {kind:'error'|'aborted'}` chunks rather than
  *   throwing — both are sanctioned StreamChunk error paths.
@@ -144,13 +137,6 @@ export class PiAiAdapter extends LlmAdapter {
   }
 
   async * stream(options: GenerateOptions): AsyncIterable<StreamChunk> {
-    if (options.prefill !== undefined) {
-      throw new LlmError(
-        'prefill is not supported by the pi-ai adapter',
-        'UNSUPPORTED',
-      )
-    }
-
     const model = buildModel(options.model, this.options)
     // Undefined config means "provider default" (DeepSeek: thinking ENABLED),
     // matching llm-deepseek's omission semantics. pi-ai derives the wire

packages/llm/llm-pi-ai/src/convert.ts

@@ -93,7 +93,7 @@ export function toPiContext(options: GenerateOptions): PiContext {
             })
             break
           default:
-            // image / plugin-added block types: not representable here.
+            // plugin-added block types: not representable here.
             break
         }
       }

packages/llm/llm-pi-ai/tests/adapter.spec.ts

@@ -2,7 +2,7 @@ import { createServer } from 'node:http'
 import type { IncomingMessage, Server, ServerResponse } from 'node:http'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { Context } from 'cordis'
-import LlmService, { CallId, LlmError, userAgent } from '@deepseek-ai/dsh-llm'
+import LlmService, { CallId, userAgent } from '@deepseek-ai/dsh-llm'
 import * as LlmPiAi from '@deepseek-ai/dsh-llm-pi-ai'
 import { buildModel, PiAiAdapter } from '@deepseek-ai/dsh-llm-pi-ai'
 import { assemble } from './assemble.ts'
@@ -98,8 +98,8 @@ describe('PiAiAdapter against a mock server', () => {
     expect(result.usage).toMatchObject({ inputTokens: 3, outputTokens: 1 })
 
     // Attribution reaches the wire through pi-ai's headers hook: the exact
-    // shared User-Agent, and no provider-specific headers without an
-    // explicitly configured target.
+    // shared User-Agent, and no provider-specific headers under the
+    // User-Agent-only contract.
     expect(server.headers[0]?.['user-agent']).toBe(userAgent())
     expect(server.headers[0]).not.toHaveProperty('http-referer')
     expect(server.headers[0]).not.toHaveProperty('x-openrouter-title')
@@ -162,26 +162,26 @@ describe('PiAiAdapter against a mock server', () => {
     expect(server.requests[0]).toMatchObject({ stop: ['END'] })
   })
 
-  it('preserves per-tool strict exactly through onPayload', async () => {
+  it('scrubs pi-ai\'s own per-tool strict default through onPayload', async () => {
     const server = await mockServer([{ events: textEvents }])
     const ctx = await harness(server.url)
     await assemble(ctx,{
       model: 'deepseek-v4-flash',
       messages: [],
       tools: [
-        { name: 'strict_true', description: 'true', parameters: {}, strict: true },
-        { name: 'strict_false', description: 'false', parameters: {}, strict: false },
-        { name: 'strict_omitted', description: 'omitted', parameters: {} },
+        { name: 'alpha', description: 'a', parameters: {} },
+        { name: 'beta', description: 'b', parameters: {} },
       ],
     })
 
+    // pi-ai stamps `strict` on every serialized tool function; the harness
+    // contract has none and the hand-rolled twin sends no such field, so the
+    // payload fixup must have deleted it from every tool.
     const request = server.requests[0] as { tools: { function: { name: string; strict?: boolean } }[] }
-    expect(request.tools.map(tool => [tool.function.name, tool.function.strict])).toEqual([
-      ['strict_true', true],
-      ['strict_false', false],
-      ['strict_omitted', undefined],
-    ])
-    expect('strict' in request.tools[2]!.function).toBe(false)
+    expect(request.tools.map(tool => tool.function.name)).toEqual(['alpha', 'beta'])
+    for (const tool of request.tools) {
+      expect('strict' in tool.function).toBe(false)
+    }
   })
 
   it('preserves raw replayed tool-call arguments in the provider payload', async () => {
@@ -222,15 +222,6 @@ describe('PiAiAdapter against a mock server', () => {
     expect(result.finish).toMatchObject({ kind: 'error', code })
   })
 
-  it('rejects prefill with UNSUPPORTED', async () => {
-    const ctx = await harness('http://127.0.0.1:1')
-    await expect(assemble(ctx,{
-      model: 'deepseek-v4-flash',
-      messages: [],
-      prefill: [{ type: 'text', text: 'Sure' }],
-    })).rejects.toThrow(LlmError)
-  })
-
   it('registers/unregisters models on the llm service (HMR safety)', async () => {
     const ctx = new Context()
     await ctx.plugin(LlmService)

packages/llm/llm-pi-ai/tests/convert.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { CallId } from '@deepseek-ai/dsh-llm'
-import type { StreamChunk } from '@deepseek-ai/dsh-llm'
+import type { ContentBlock, StreamChunk } from '@deepseek-ai/dsh-llm'
 import type { AssistantMessage, AssistantMessageEvent, Usage } from '@earendil-works/pi-ai'
 import { mapStopReason, mapUsage, toPiContext, toStreamChunks } from '@deepseek-ai/dsh-llm-pi-ai'
 
@@ -171,13 +171,13 @@ describe('toPiContext', () => {
     expect(context.messages.map(message => message.role)).toEqual(['user', 'user', 'toolResult'])
   })
 
-  it('skips image and unknown blocks in assistant content', () => {
+  it('skips plugin-added (unknown) blocks in assistant content', () => {
     const context = toPiContext({
       model: 'm',
       messages: [{
         role: 'assistant',
         content: [
-          { type: 'image', url: 'data:,x' },
+          { type: 'chart', data: 'x' } as unknown as ContentBlock,
           { type: 'text', text: 'visible' },
         ],
       }],