pi-bedrock-compat 0.0.0-stage → 0.1.0

package/CHANGELOG.md

@@ -0,0 +1,8 @@
+# Changelog
+
+## 0.1.0
+
+- Publish the package as `pi-bedrock-compat` so future Bedrock compatibility fixes can live in the same extension.
+- Hoist images out of Bedrock Converse tool results for models other than Anthropic Claude and Amazon Nova.
+- Preserve tool-result text, status, ordering, and image-only results.
+- Repair outgoing payloads without modifying stored Pi session history.

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Jillian Kozyra
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,3 +1,66 @@
-# Temporary Holding Version
+# pi-bedrock-compat
 
-This version is a temporary placeholder for this package. An operational version to replace this has been submitted for review and is awaiting a staged release.
+A [Pi](https://pi.dev) extension that applies compatibility fixes for models accessed through Amazon Bedrock Converse.
+
+## Overview
+
+Pi normally places images returned by tools inside `toolResult.content`. Amazon Bedrock supports that shape for Anthropic Claude and Amazon Nova, but other image-capable models can reject it with a validation error.
+
+For affected models, this extension moves each image beside its tool result in the outgoing user message. The request remains valid for Bedrock, vision input is preserved, and Pi's stored session history is not modified.
+
+The rewrite runs only when the selected provider is `amazon-bedrock`, the API is `bedrock-converse-stream`, and the model is not identified as Claude or Nova. It supports system and application inference profiles, and unknown or malformed payloads pass through unchanged.
+
+## Install
+
+After the package is published, install it from npm:
+
+```bash
+pi install npm:pi-bedrock-compat
+```
+
+Alternatively, install it directly from GitHub:
+
+```bash
+pi install git:github.com/jekozyra/pi-bedrock-compat
+```
+
+Restart Pi after installation, or run `/reload` in an active session.
+
+## Usage
+
+No configuration is required. Once installed, the extension automatically changes affected Bedrock Converse requests from this shape:
+
+```text
+user: [toolResult(content: [text, image])]
+```
+
+To this shape:
+
+```text
+user: [toolResult(content: [text]), image]
+```
+
+When a tool result contains only images, the extension inserts an `<empty>` text block so Bedrock still receives a non-empty tool result. The extension does not change encrypted reasoning returned by OpenAI models on Bedrock, which Pi displays as `[Reasoning redacted]`.
+
+## Related docs
+
+- [Pi issue #8643](https://github.com/earendil-works/pi/issues/8643)
+- [AWS `ToolResultContentBlock.image` API reference](https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_ToolResultContentBlock.html)
+
+## Contributing
+
+To contribute a change, install Node.js 22.19 or newer, then run the project checks locally:
+
+```bash
+npm install
+npm run check
+npm run smoke:package
+```
+
+## Maintainers
+
+Maintained by [Jillian Kozyra](https://github.com/jekozyra).
+
+## License
+
+MIT

package/package.json

@@ -1,6 +1,57 @@
 {
   "name": "pi-bedrock-compat",
-  "version": "0.0.0-stage",
-  "stub": true,
-  "description": "Temporary package placeholder for staged publishing"
-}
+  "version": "0.1.0",
+  "description": "Compatibility fixes for Pi models using Amazon Bedrock Converse",
+  "keywords": [
+    "amazon-bedrock",
+    "bedrock-converse",
+    "compatibility",
+    "pi-extension",
+    "pi-package"
+  ],
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jekozyra/pi-bedrock-compat.git"
+  },
+  "files": [
+    "src",
+    "README.md",
+    "CHANGELOG.md",
+    "LICENSE"
+  ],
+  "type": "module",
+  "scripts": {
+    "test": "tsx --test tests/*.test.ts",
+    "typecheck": "tsc --noEmit",
+    "check": "npm run fmt:check && npm run lint && npm run typecheck && npm test",
+    "smoke:package": "npm pack --dry-run",
+    "fmt": "oxfmt --write .",
+    "fmt:check": "oxfmt --check .",
+    "lint": "oxlint --deny-warnings src tests"
+  },
+  "devDependencies": {
+    "@earendil-works/pi-coding-agent": "1.0.0",
+    "@types/node": "^22.0.0",
+    "oxfmt": "0.68.0",
+    "oxlint": "1.83.0",
+    "tsx": "^4.20.0",
+    "typescript": "^5.8.3"
+  },
+  "peerDependencies": {
+    "@earendil-works/pi-coding-agent": "*"
+  },
+  "peerDependenciesMeta": {
+    "@earendil-works/pi-coding-agent": {
+      "optional": true
+    }
+  },
+  "engines": {
+    "node": ">=22.19.0"
+  },
+  "pi": {
+    "extensions": [
+      "./src/index.ts"
+    ]
+  }
+}

package/src/index.ts

@@ -0,0 +1,28 @@
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { hoistToolResultImages, supportsNestedToolResultImages } from "./payload.ts";
+
+export interface ProviderModel {
+  provider: string;
+  api: string;
+  id: string;
+  name?: string;
+}
+
+export function shouldRewrite(model: ProviderModel | undefined): boolean {
+  return (
+    model?.provider === "amazon-bedrock" &&
+    model.api === "bedrock-converse-stream" &&
+    !supportsNestedToolResultImages(model)
+  );
+}
+
+export default function bedrockCompat(pi: ExtensionAPI): void {
+  pi.on("before_provider_request", (event, ctx) => {
+    if (!shouldRewrite(ctx.model)) {
+      return undefined;
+    }
+
+    const rewritten = hoistToolResultImages(event.payload);
+    return rewritten === event.payload ? undefined : rewritten;
+  });
+}

package/src/payload.ts

@@ -0,0 +1,98 @@
+const EMPTY_TEXT_PLACEHOLDER = "<empty>";
+
+type UnknownRecord = Record<string, unknown>;
+
+export interface BedrockModelReference {
+  id: string;
+  name?: string;
+}
+
+function isRecord(value: unknown): value is UnknownRecord {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+
+function isImageBlock(value: unknown): value is UnknownRecord {
+  return isRecord(value) && isRecord(value.image);
+}
+
+function isSupportedNestedImageFamily(value: string): boolean {
+  const normalized = value.toLowerCase().replace(/[\s_/:]+/gu, ".");
+
+  return (
+    normalized.includes("anthropic.claude") ||
+    /(?:^|\.)claude(?:\.|$)/u.test(normalized) ||
+    normalized.includes("amazon.nova") ||
+    /(?:^|\.)nova(?:\.|$)/u.test(normalized)
+  );
+}
+
+/** Whether Bedrock documents this model family as supporting images inside tool results. */
+export function supportsNestedToolResultImages(model: BedrockModelReference): boolean {
+  return [model.id, model.name].some(
+    (value) => value !== undefined && isSupportedNestedImageFamily(value),
+  );
+}
+
+function rewriteMessage(message: unknown): { message: unknown; changed: boolean } {
+  if (!isRecord(message) || !Array.isArray(message.content)) {
+    return { message, changed: false };
+  }
+
+  const hoistedImages: UnknownRecord[] = [];
+  let changed = false;
+  const content = message.content.map((block) => {
+    if (!isRecord(block) || !isRecord(block.toolResult)) {
+      return block;
+    }
+
+    const toolResult = block.toolResult;
+    if (!Array.isArray(toolResult.content)) {
+      return block;
+    }
+
+    const images = toolResult.content.filter(isImageBlock);
+    if (images.length === 0) {
+      return block;
+    }
+
+    const remaining = toolResult.content.filter((item) => !isImageBlock(item));
+    hoistedImages.push(...images);
+    changed = true;
+
+    return {
+      ...block,
+      toolResult: {
+        ...toolResult,
+        content: remaining.length > 0 ? remaining : [{ text: EMPTY_TEXT_PLACEHOLDER }],
+      },
+    };
+  });
+
+  if (!changed) {
+    return { message, changed: false };
+  }
+
+  return {
+    message: { ...message, content: [...content, ...hoistedImages] },
+    changed: true,
+  };
+}
+
+/**
+ * Hoist images out of Bedrock Converse tool results without mutating the input payload.
+ * Malformed or unrelated payloads are returned unchanged.
+ */
+export function hoistToolResultImages(payload: unknown): unknown {
+  if (!isRecord(payload) || !Array.isArray(payload.messages)) {
+    return payload;
+  }
+
+  let changed = false;
+  const messages = payload.messages.map((message) => {
+    const rewritten = rewriteMessage(message);
+    changed ||= rewritten.changed;
+    return rewritten.message;
+  });
+
+  return changed ? { ...payload, messages } : payload;
+}