@xiaoso/dsh-tool-plus 0.1.0-beta.2 → 0.1.0-beta.3

package/lib/types/tools/omp/utils/image-loading.d.ts

@@ -1,7 +1,5 @@
-import type { Context, ImageContent, Message, Model } from "@oh-my-pi/pi-ai";
+import type { ImageContent, Model } from "@oh-my-pi/pi-ai";
 import { type ImageResizeOptions } from "./image-resize";
-export declare const MAX_IMAGE_INPUT_BYTES: number;
-export declare const SUPPORTED_INPUT_IMAGE_MIME_TYPES: Set<string>;
 /**
  * Ollama and its local-backend family decode image input through llama.cpp /
  * `stb_image`, which is compiled without WebP support, so a WebP upload fails
@@ -15,6 +13,8 @@ export declare function modelLacksWebpSupport(model: Pick<Model, "provider" | "a
  * into {@link ImageResizeOptions.excludeWebP}.
  */
 export declare function webpExclusionForModel(model: Pick<Model, "provider" | "api"> | undefined): true | undefined;
+export declare const MAX_IMAGE_INPUT_BYTES: number;
+export declare const SUPPORTED_INPUT_IMAGE_MIME_TYPES: Set<string>;
 export interface LoadImageInputOptions {
     path: string;
     cwd: string;
@@ -24,16 +24,13 @@ export interface LoadImageInputOptions {
     detectedMimeType?: string;
     /** Force non-WebP output (e.g. for Ollama). Leave unset to honor `OMP_NO_WEBP`. */
     excludeWebP?: boolean;
-}
-/** Options for loading an in-memory chat image attachment as a vision-model input. */
-export interface LoadImageAttachmentInputOptions {
-    image: ImageContent;
-    label: string;
-    uri: string;
-    autoResize: boolean;
-    maxBytes?: number;
-    /** Force non-WebP output (e.g. for Ollama). Leave unset to honor `OMP_NO_WEBP`. */
-    excludeWebP?: boolean;
+    /**
+     * DSH extension (拍板#22 config expansion): resize-knob passthrough onto
+     * {@link resizeImage}. Upstream never passes these — it relies on the
+     * hardcoded 1568px/500KB/200px/quality-80 defaults; the tool-plus config
+     * panel wires user-tunable values through here. Unset = upstream behavior.
+     */
+    resize?: ImageResizeOptions;
 }
 export interface LoadedImageInput {
     resolvedPath: string;
@@ -51,27 +48,4 @@ export declare class ImageInputTooLargeError extends Error {
 /** Converts an image to PNG, rejecting when the runtime cannot decode or encode it. */
 export declare function convertImageToPng(image: ImageContent): Promise<ImageContent>;
 export declare function ensureSupportedImageInput(image: ImageContent): Promise<ImageContent | null>;
-export interface NormalizeModelContextImagesOptions {
-    /** Model the images are bound for; used to derive encoder constraints (WebP exclusion for Ollama). */
-    model?: Model;
-    resize?: ImageResizeOptions;
-}
-/**
- * Normalize image blocks before they enter agent/model context. This keeps
- * provider request construction from having to resize an unbounded batch of
- * large images on the streaming hot path. Images are processed sequentially on
- * purpose: `resizeImage` may fan out multiple encoders for one image, so the
- * outer image batch must stay bounded.
- */
-export declare function normalizeModelContextImages(images: ImageContent[] | undefined, options?: NormalizeModelContextImagesOptions): Promise<ImageContent[] | undefined>;
-/**
- * Rewrites historical/resumed WebP blocks in the ephemeral provider request.
- * Persisted session messages remain untouched, while STB-backed local servers
- * never receive a format they cannot decode.
- */
-export declare function normalizeModelContextMessages(messages: Message[], model: Model | undefined): Promise<Message[]>;
-/** Normalizes historical image blocks in an ephemeral provider request. */
-export declare function normalizeProviderContextImagesForModel(context: Context, model: Model): Promise<Context>;
 export declare function loadImageInput(options: LoadImageInputOptions): Promise<LoadedImageInput | null>;
-/** Loads a chat attachment image through the same size and encoder policy as file-backed image inputs. */
-export declare function loadImageAttachmentInput(options: LoadImageAttachmentInputOptions): Promise<LoadedImageInput | null>;

package/lib/types/tools/read/adapter/index.d.ts

@@ -14,6 +14,7 @@
 import type { Context } from '@deepseek-ai/cordis';
 import type { AgentToolResult } from '@oh-my-pi/pi-agent-core';
 import type { RuntimeConfig } from '../../../config/settings.ts';
+import type { SavedImageRef } from '../../shared/image-bridge.ts';
 export type { Settings } from '../../omp/config/settings.ts';
 export type { ToolSession } from '../../omp/sdk.ts';
 /** DSH read 工具输出形状（output.schema 镜像）。 */
@@ -24,6 +25,8 @@ export interface ReadToolOutput {
     notice?: string;
     totalLines?: number;
     truncated?: boolean;
+    /** 拍板#22：图片读取的附件提交结果（信封文本已并入 text，此字段供 UI/审计）。 */
+    image?: SavedImageRef;
 }
 /**
  * 把 OMP AgentToolResult 转成 DSH read 工具输出。
@@ -35,7 +38,7 @@ export declare function toReadToolResult(result: AgentToolResult<any>, args: any
 /** render：模型可见文本 = 工具文本 + session 层提示（OMP messages.ts 语义）。 */
 export declare function renderReadOutput(value: ReadToolOutput): string;
 /** 完整执行链路（defineTool.execute 与单测共用）。 */
-export declare function executeReadTool(exec: any, cfg: RuntimeConfig, args: any): Promise<ReadToolOutput>;
+export declare function executeReadTool(exec: any, cfg: RuntimeConfig, args: any, ctx: Context): Promise<ReadToolOutput>;
 /**
  * Register the read tool (OMP native `path` + inline selector parameter,
  * plan.md 拍板#2).

package/lib/types/tools/read-image/index.d.ts

@@ -17,6 +17,10 @@ export interface ImageReadValue {
         width: number;
         height: number;
         name?: string;
+        originalDimensions?: {
+            width: number;
+            height: number;
+        };
     };
 }
 export declare function imageMediaTypeForPath(filePath: string): ImageMediaType | undefined;

package/lib/types/tools/shared/bun-shim.d.ts

@@ -57,8 +57,40 @@ declare class CryptoHasherShim {
     update(data: string | Uint8Array): this;
     digest(encoding: 'hex' | 'base64' | 'buffer' | string): string | Buffer;
 }
-declare class BunImageUnavailable {
-    constructor();
+interface ImageStep {
+    op: 'resize' | 'png' | 'jpeg' | 'webp' | 'rotate' | 'flip' | 'blur' | 'sharpen';
+    args: unknown[];
+}
+export declare class BunImageShim {
+    #private;
+    constructor(bytes: Uint8Array | ArrayBuffer, steps?: readonly ImageStep[]);
+    metadata(): Promise<{
+        width: number;
+        height: number;
+        format?: string;
+        hasAlpha?: boolean;
+    }>;
+    resize(widthOrOpts?: number | {
+        width?: number;
+        height?: number;
+        quality?: number;
+    }, height?: number): BunImageShim;
+    /** Bun's resize() accepts { width, height, fit } — expose fit through to sharp. */
+    resizeWithFit(width: number, height: number, fit: 'cover' | 'contain' | 'fill' | 'inside' | 'outside'): BunImageShim;
+    png(): BunImageShim;
+    jpeg(opts?: {
+        quality?: number;
+    }): BunImageShim;
+    webp(opts?: {
+        quality?: number;
+    }): BunImageShim;
+    rotate(): BunImageShim;
+    flip(flip: boolean): BunImageShim;
+    blur(radius: number): BunImageShim;
+    sharpen(radius?: number): BunImageShim;
+    bytes(): Promise<Uint8Array>;
+    toBase64(): Promise<string>;
+    write(destPath: string): Promise<number>;
 }
 type ArchiveMemberContent = string | Uint8Array | Blob;
 declare function archiveWrite(destPath: string, record: Record<string, ArchiveMemberContent>, opts?: {
@@ -76,7 +108,7 @@ export interface BunShimSurface {
         write: typeof archiveWrite;
     };
     FileSink: typeof FileSinkShim;
-    Image: typeof BunImageUnavailable;
+    Image: typeof BunImageShim;
     CryptoHasher: typeof CryptoHasherShim;
     color(color: string, format?: string): string;
     JSON: {

package/lib/types/tools/shared/image-bridge.d.ts

@@ -0,0 +1,98 @@
+/**
+ * Shared image bridge (拍板#22, 2026-08-28) — the single DSH-facing seam
+ * through which the OMP engines (read's restored image path, fetch's URL
+ * image path) turn image bytes into model-visible content.
+ *
+ * DSH's content model has no inline base64 image block: an ImageBlock is
+ * exactly `{ type: 'image', attachment: ImageAttachmentRef }`
+ * (dsh-llm types). Every image entering the model therefore MUST pass
+ * through the host `attachments` service (saveImage → content-addressed
+ * normalized master → per-request variants). This module owns:
+ *
+ *  - the extension → media-type table (mirrors official dsh-tool-fs),
+ *  - the route vision-capability probe (omp flavor: unknown passes, explicit
+ *    non-image routes soft-refuse to a model-facing metadata text instead of
+ *    a thrown error — 用户拍板 2026-08-28),
+ *  - saveImage + AttachmentError → recoverable-message mapping (official
+ *    read_image's five-branch design, verbatim wording),
+ *  - the `<path>/<type>/<content>` envelope with originalDimensions
+ *    coordinate-multiplier advice (official formatImageReadOutput).
+ *
+ * The OMP layer never imports cordis/dsh packages: engines call these helpers
+ * through `ToolSession.getAttachments` and the exec context the adapter
+ * hands them, keeping the omp/ copies upstream-shaped.
+ */
+export type ImageMediaType = 'image/png' | 'image/jpeg' | 'image/webp' | 'image/gif';
+/** Normalized outcome of one attachment-store commit (official ref shape). */
+export interface SavedImageRef {
+    attachmentId: string;
+    mediaType: ImageMediaType;
+    bytes: number;
+    width: number;
+    height: number;
+    name?: string;
+    originalDimensions?: {
+        width: number;
+        height: number;
+    };
+}
+/** Minimal structural view of the host `attachments` service. */
+export interface AttachmentsService {
+    imageLimits?: {
+        maxImageBytes?: number;
+        maxMessageImageBytes?: number;
+        maxImagePixels?: number;
+        maxImageDimension?: number;
+        mediaTypes?: readonly string[];
+    };
+    saveImage?: (input: {
+        data: Uint8Array;
+        mediaType: string;
+        name?: string;
+    }) => Promise<unknown>;
+}
+/** Minimal structural view of the host `llm` service. */
+export interface LlmRouteService {
+    resolveModelInfo?: (provider: string, model: string, signal: AbortSignal) => Promise<{
+        inputModalities?: readonly string[];
+    }>;
+}
+/**
+ * Facade the DSH adapter builds over ctx.get('attachments')/ctx.get('llm')
+ * plus the calling route, handed to the engines via ToolSession.
+ */
+export interface ImageBridge {
+    attachments: AttachmentsService | undefined;
+    /** 'supported' = route declares image input; 'unsupported' = declares it does not; 'unknown' = not resolvable. */
+    routeImageSupport: () => Promise<'supported' | 'unsupported' | 'unknown'>;
+}
+export declare const IMAGE_EXTENSIONS: Readonly<Record<string, ImageMediaType>>;
+export declare function imageMediaTypeForExtension(ext: string): ImageMediaType | undefined;
+/** Admission byte cap: min(source cap, per-message cap) — official formula. */
+export declare function imageByteCap(bridge: ImageBridge, fallback?: number): number;
+/** Commit bytes to the attachment store, mapping AttachmentErrors to the
+ * official read_image recoverable messages. `displayPath` is only used for
+ * message rendering. Throws Error (not AttachmentError) for model consumption. */
+export declare function saveImageViaBridge(bridge: ImageBridge, input: {
+    data: Uint8Array;
+    mediaType: ImageMediaType;
+    name?: string;
+    displayPath: string;
+}): Promise<SavedImageRef>;
+/** Accept either the official branded ref or a plain object from a mock. */
+export declare function normalizeSavedImageRef(ref: unknown): SavedImageRef;
+export declare function formatImageEnvelope(displayPath: string, image: SavedImageRef): string;
+/** Content blocks for one committed image: envelope text + attachment block. */
+export declare function imageContentBlocks(displayPath: string, image: SavedImageRef): Array<{
+    type: 'text';
+    text: string;
+} | {
+    type: 'image';
+    attachment: SavedImageRef;
+}>;
+export declare function formatImageUnsupportedNote(displayPath: string, metadata: {
+    mimeType?: string;
+    width?: number;
+    height?: number;
+    bytes?: number;
+} | undefined, reason: string): string;

package/lib/types/tools/shared/omp-prompt.d.ts

@@ -12,7 +12,9 @@
 export interface OmpPromptVars {
     /** read 输出是否带 [PATH#TAG] hashline 锚点头（= edit.mode === 'hashline'） */
     IS_HL_MODE?: boolean;
-    /** DSH 无 inspect_image 工具（有 read_image），恒 false → 取 else 分支 */
+    /** DSH 无 inspect_image 工具：read.md 图片条件句恒渲染 else 分支（引擎内部
+     *  #renderDescription 用），DSH 面再经 sanitizeReadPrompt 改写为附件提交语义
+     *  （拍板#22：图片经 attachments 入库，非 vision 路由降级 metadata 文本）。 */
     INSPECT_IMAGE_ENABLED?: boolean;
     /** DSH 无 OMP Task/scout 子代理，恒 false → 相关句在 sanitize 中整体剔除，无需变量 */
     scoutAvailable?: boolean;
@@ -25,7 +27,7 @@ export declare function cleanLines(text: string): string;
 export declare function sanitizeGrepPrompt(text: string): string;
 /** glob.md：internal URL/memory:// 提法 + scout avoid 句剔除。 */
 export declare function sanitizeGlobPrompt(text: string): string;
-/** read.md：browser/inspect_image 提法剔除 + internal URIs 段删除（{{#if}} 由 renderer 处理）。 */
+/** read.md：browser 提法剔除 + 图片句改为 DSH 实际行为（拍板#22 附件提交）+ internal URIs 段删除（{{#if}} 由 renderer 处理）。 */
 export declare function sanitizeReadPrompt(text: string): string;
 /** ast-edit.md：xd://resolve 预演确认协议已随内部路由删除；DSH 为预览后自动落盘（拍板#14）。 */
 export declare function sanitizeAstEditPrompt(text: string): string;