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

package/lib/types/tools/edit/adapter/tools/auto-generated-guard.d.ts

@@ -1,20 +1,10 @@
-import { type Settings } from "../../../omp/config/settings.ts";
 /**
- * Check if a file is auto-generated by examining its content.
- * Throws ToolError if the file appears to be auto-generated.
+ * A-3 合并后的纯转发层（second-impl-audit.md A-3）。
  *
- * @param absolutePath - Absolute path to the file
- * @param displayPath - Path to show in error messages (relative or as provided)
- * @param activeSettings - Session settings; falls back to global settings or the schema default
+ * 唯一实现在 `src/tools/omp/tools/auto-generated-guard.ts`（OMP refs
+ * packages/coding-agent/src/tools/auto-generated-guard.ts 的逐字移植，
+ * 含 T17-1 Windows basename 修复）。本文件不再持有任何守卫逻辑，仅为
+ * 既有 import 路径（omp/edit/hashline/filesystem.ts 等历史引用与单测）
+ * 保留转发。
  */
-export declare function assertEditableFile(absolutePath: string, displayPath?: string, activeSettings?: Settings): Promise<void>;
-/**
- * Check if file content is auto-generated.
- * Uses only the first CHECK_BYTE_COUNT characters of the content.
- * Throws ToolError if the content appears to be auto-generated.
- *
- * @param content - File content to check (can be full content or prefix)
- * @param displayPath - Path to show in error messages
- * @param activeSettings - Session settings; falls back to global settings or the schema default
- */
-export declare function assertEditableFileContent(content: string, displayPath: string, activeSettings?: Settings): void;
+export { assertEditableFile, assertEditableFileContent, } from "../../../omp/tools/auto-generated-guard.ts";

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

@@ -6,16 +6,42 @@
  * this adapter only:
  *  - builds an OMP `ToolSession` from the DSH exec context + tool-plus config,
  *  - constructs the verbatim `GlobTool` and calls its `execute`,
- *  - converts the `AgentToolResult` back to a DSH tool result.
+ *  - converts the `AgentToolResult` back to a DSH tool result, appending the
+ *    OMP session-layer meta notice (`formatOutputNotice`, A-6) to the
+ *    model-visible text.
  *
  * plan.md 拍板：glob keeps OMP's native single-param style (`path` with a
  * semicolon-delimited multi-target list). DSH `hidden`/`gitignore`/`limit`
  * are surfaced verbatim as optional parameters.
  */
 import type { Context } from '@deepseek-ai/cordis';
+import type { AgentToolResult } from '@oh-my-pi/pi-agent-core';
 import type { RuntimeConfig } from '../../../config/settings.ts';
 export type { Settings } from '../../omp/config/settings.ts';
 export type { ToolSession } from '../../omp/sdk.ts';
+/** DSH glob 工具输出形状（output.schema 镜像）。 */
+export interface GlobToolOutput {
+    path: string;
+    text: string;
+    fileCount?: number;
+    truncated?: boolean;
+}
+/**
+ * 把 OMP AgentToolResult 转成 DSH glob 工具输出。
+ *
+ * 上游 session 层会把 `formatOutputNotice(details.meta)` 的限量/截断提示追加
+ * 进模型可见文本（wrapToolWithMetaNotice → appendOutputNotice，refs
+ * tools/output-meta.ts:586）；DSH 无 session 层，适配层在此补上（A-6），
+ * 否则 glob 超限截断对模型静默。
+ */
+export declare function toGlobToolResult(result: AgentToolResult<any>, args: any): GlobToolOutput;
+/**
+ * 完整执行链路（defineTool.execute 与单测共用）。
+ *
+ * `ctx` 参数与 read 的 executeReadTool 对齐（glob 引擎不需要 image bridge /
+ * session state，仅占位保持签名一致）。
+ */
+export declare function executeGlobTool(exec: any, cfg: RuntimeConfig, args: any, ctx: Context): Promise<GlobToolOutput>;
 /**
  * Register the glob tool (OMP native `path` + optional `hidden`/`gitignore`/
  * `limit` parameters).

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

@@ -6,15 +6,43 @@
  * this adapter only:
  *  - builds an OMP `ToolSession` from the DSH exec context + tool-plus config,
  *  - constructs the verbatim `GrepTool` and calls its `execute`,
- *  - converts the `AgentToolResult` back to a DSH tool result.
+ *  - converts the `AgentToolResult` back to a DSH tool result, appending the
+ *    OMP session-layer meta notice (`formatOutputNotice`, A-6) to the
+ *    model-visible text.
  *
  * Parameters follow OMP's native style (`pattern` regex + `path` with inline
  * `:N-M` selectors); the DSH tool exposes the same schema so nothing is lost.
  */
 import type { Context } from '@deepseek-ai/cordis';
+import type { AgentToolResult } from '@oh-my-pi/pi-agent-core';
 import type { RuntimeConfig } from '../../../config/settings.ts';
 export type { Settings } from '../../omp/config/settings.ts';
 export type { ToolSession } from '../../omp/sdk.ts';
+/** DSH grep 工具输出形状（output.schema 镜像）。 */
+export interface GrepToolOutput {
+    text: string;
+    matchCount?: number;
+    fileCount?: number;
+    files?: string[];
+    scopePath?: string;
+    truncated?: boolean;
+}
+/**
+ * 把 OMP AgentToolResult 转成 DSH grep 工具输出。
+ *
+ * 上游 session 层会把 `formatOutputNotice(details.meta)` 的限量/截断提示追加
+ * 进模型可见文本（wrapToolWithMetaNotice → appendOutputNotice，refs
+ * tools/output-meta.ts:586）；DSH 无 session 层，适配层在此补上（A-6），
+ * 否则 grep 的列宽截断/限量对模型静默。
+ */
+export declare function toGrepToolResult(result: AgentToolResult<any>): GrepToolOutput;
+/**
+ * 完整执行链路（defineTool.execute 与单测共用）。
+ *
+ * `ctx` 参数与 read 的 executeReadTool 对齐（grep 引擎不需要 image bridge /
+ * session state，仅占位保持签名一致）。
+ */
+export declare function executeGrepTool(exec: any, cfg: RuntimeConfig, args: any, ctx: Context): Promise<GrepToolOutput>;
 /**
  * Register the grep tool (OMP-native `pattern` + `path` parameters; the `path`
  * accepts an inline `:N-M` selector and may be a semicolon-delimited list).

package/lib/types/tools/omp/edit/dispatch.d.ts

@@ -0,0 +1,43 @@
+/**
+ * Edit dispatch layer — path resolution + multi-entry/multi-file aggregation.
+ *
+ * Ported verbatim from upstream `packages/coding-agent/src/edit/index.ts`
+ * (refs/oh-my-pi, 17.3.5): `resolveEditPath` (:77-93), `executeApplyPatchPerFile`
+ * (:139-256) and `executeSinglePathEntries` (:258-365). Algorithm and user-facing
+ * copy are byte-for-byte upstream; only the import surface was redirected to the
+ * DSH-resident modules and the LSP-only surface was cut, per the established
+ * omp/ adaptation conventions:
+ *   - `renderer` → `./details` (TUI renderer cut, plan.md 拍板#17): the
+ *     `EditToolDetails` / `EditToolPerFileResult` shapes live in `./details.ts`;
+ *     the upstream per-file `diagnostics` field went with the LSP layer.
+ *   - `resolvePlanPath` → DSH adapter shim (`edit/adapter/tools/plan-mode-guard`,
+ *     verbatim resolution minus local:// schemes) — same redirection the local
+ *     engines (modes/replace.ts, modes/patch.ts) already use.
+ *   - `LspBatchRequest` / `flushLspWritethroughBatch` → local type + no-op below.
+ *     DSH never constructs an outer batch request, so every `batchRequest` inside
+ *     the aggregators resolves to `undefined` and the flush branches stay
+ *     unreachable; the flow is kept verbatim so this file stays diffable
+ *     against refs.
+ */
+import type { AgentToolResult } from "@oh-my-pi/pi-agent-core";
+import type { ToolSession } from "../tools/index.ts";
+import type { EditToolDetails } from "./details";
+/**
+ * LSP write-batch handle (upstream `tools/render-utils.ts`, surfaced through the
+ * edit renderer). Shape verbatim; DSH cuts the LSP layer (plan.md 拍板#5), so no
+ * caller ever constructs one — see {@link flushLspWritethroughBatch}.
+ */
+export interface LspBatchRequest {
+    id: string;
+    flush: boolean;
+}
+export declare function resolveEditPath(session: ToolSession, authoredPath: string, options: {
+    mustExist: boolean;
+    signal?: AbortSignal;
+}): Promise<string>;
+/** Run apply_patch file operations and aggregate their multi-file result. */
+export declare function executeApplyPatchPerFile(fileEntries: {
+    path: string;
+    run: (batchRequest: LspBatchRequest | undefined) => Promise<AgentToolResult<EditToolDetails>>;
+}[], outerBatchRequest: LspBatchRequest | undefined, cwd: string, signal: AbortSignal | undefined, onUpdate?: (partialResult: AgentToolResult<EditToolDetails>) => void): Promise<AgentToolResult<EditToolDetails>>;
+export declare function executeSinglePathEntries(path: string, runs: ((batchRequest: LspBatchRequest | undefined) => Promise<AgentToolResult<EditToolDetails>>)[], outerBatchRequest: LspBatchRequest | undefined, onUpdate: ((partialResult: AgentToolResult<EditToolDetails>) => void) | undefined, cwd: string, signal: AbortSignal | undefined): Promise<AgentToolResult<EditToolDetails>>;

package/lib/types/tools/omp/edit/hashline/noop-loop-guard.d.ts

@@ -65,8 +65,10 @@ export declare function recordNoopEdit(session: NoopLoopGuardOwner, canonicalPat
  */
 export declare function resetNoopEdit(session: NoopLoopGuardOwner, canonicalPath: string): void;
 /**
- * Stable hash of the raw patch input. Bun's `Bun.hash` is xxHash64 — fast,
+ * Stable hash of the raw patch input. Bun's `Bun.hash` is wyhash64 — fast,
  * non-cryptographic, more than adequate for "is this the same payload?".
+ * (xxHash64 is the separate `Bun.hash.xxHash64` namespace; the shim serves
+ * both — second-impl-audit.md S-3.)
  */
 export declare function hashPatchInput(input: string): string;
 export {};

package/lib/types/tools/omp/sdk.d.ts

@@ -39,6 +39,12 @@ export interface ToolSession {
     getActiveModelString?: () => string | undefined;
     /** Active model object (image-capability checks; optional in DSH). */
     getActiveModel?: () => Model | undefined;
+    /**
+     * DSH image bridge (拍板#22): attachment store + route vision-capability
+     * probe handed to the read/fetch image paths. Optional — engines degrade to
+     * a model-facing metadata text when absent.
+     */
+    imageBridge?: () => import('../shared/image-bridge.ts').ImageBridge | undefined;
     /** Clipboard state carried on the session (hashline clipboard). */
     editClipboard?: Record<string, unknown>;
     /** Hashline snapshot store (created lazily by the engine). */

package/lib/types/tools/omp/tools/auto-generated-guard.d.ts

@@ -0,0 +1,20 @@
+import { type Settings } from "../config/settings.ts";
+/**
+ * Check if a file is auto-generated by examining its content.
+ * Throws ToolError if the file appears to be auto-generated.
+ *
+ * @param absolutePath - Absolute path to the file
+ * @param displayPath - Path to show in error messages (relative or as provided)
+ * @param activeSettings - Session settings; falls back to global settings or the schema default
+ */
+export declare function assertEditableFile(absolutePath: string, displayPath?: string, activeSettings?: Settings): Promise<void>;
+/**
+ * Check if file content is auto-generated.
+ * Uses only the first CHECK_BYTE_COUNT characters of the content.
+ * Throws ToolError if the content appears to be auto-generated.
+ *
+ * @param content - File content to check (can be full content or prefix)
+ * @param displayPath - Path to show in error messages
+ * @param activeSettings - Session settings; falls back to global settings or the schema default
+ */
+export declare function assertEditableFileContent(content: string, displayPath: string, activeSettings?: Settings): void;

package/lib/types/tools/omp/tools/fetch.d.ts

@@ -49,6 +49,8 @@ export interface ReadUrlToolDetails {
     truncated: boolean;
     notes: string[];
     meta?: OutputMeta;
+    /** DSH (拍板#22): committed attachment facts when the URL image went through the bridge. */
+    image?: import("../../shared/image-bridge.ts").SavedImageRef;
 }
 interface ReadUrlEntry {
     artifactId?: string;

package/lib/types/tools/omp/tools/read.d.ts

@@ -17,6 +17,8 @@ export interface ReadToolDetails {
         from: string;
         to: string;
     };
+    /** DSH image bridge (拍板#22): committed attachment facts for an image read. */
+    image?: import("../../shared/image-bridge.ts").SavedImageRef;
     url?: string;
     finalUrl?: string;
     contentType?: string;
@@ -63,14 +65,6 @@ export declare class ReadTool implements AgentTool<typeof readSchema, ReadToolDe
     get parameters(): typeof readSchema;
     readonly strict = true;
     constructor(session: ToolSession);
-    /**
-     * Re-evaluate the effective inspect_image state; it can flip when the model
-     * or the `/vision` override changes after this tool was constructed. Keeps
-     * the behavior branch and the advertised description in lockstep. Called
-     * per image read and by tool reconciliation before prompt rebuilds (which
-     * passes the post-change availability as `availableOverride`).
-     */
-    syncInspectImageState(availableOverride?: boolean): boolean;
     execute(_toolCallId: string, params: ReadParams, signal?: AbortSignal, _onUpdate?: AgentToolUpdateCallback<ReadToolDetails>, _toolContext?: AgentToolContext): Promise<AgentToolResult<ReadToolDetails>>;
 }
 export {};

package/lib/types/tools/omp/tools/write.d.ts

@@ -3,11 +3,11 @@ import type { ToolSession } from "../../omp/sdk.ts";
 import type { OutputMeta } from "../../omp/tools/output-meta.ts";
 import { type XdevDispatch } from "../../omp/tools/resolve.ts";
 declare const writeSchema: import("@oh-my-pi/omptype").FluentType<{
-    content: string;
     path: string;
-}, {
     content: string;
+}, {
     path: string;
+    content: string;
 }>;
 export type WriteToolInput = typeof writeSchema.infer;
 /** Details returned by the write tool for TUI rendering */
@@ -36,11 +36,11 @@ export declare class WriteTool implements AgentTool<typeof writeSchema, WriteToo
     readonly label = "Write";
     readonly description: string;
     readonly parameters: import("@oh-my-pi/omptype").FluentType<{
-        content: string;
         path: string;
-    }, {
         content: string;
+    }, {
         path: string;
+        content: string;
     }>;
     readonly strict = true;
     readonly concurrency = "exclusive";

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/auto-generated-guard.dsh.d.ts

@@ -1,4 +1,16 @@
-/** Update whether auto-generated files are blocked (`edit.blockAutoGenerated`). */
-export declare function setBlockAutoGenerated(enabled: boolean): void;
-export declare function assertEditableFile(absolutePath: string, displayPath?: string, _activeSettings?: unknown): Promise<void>;
-export declare function assertEditableFileContent(content: string, displayPath: string): void;
+/**
+ * A-3 合并后的兼容转发层（second-impl-audit.md A-3）。
+ *
+ * 唯一实现在 `../omp/tools/auto-generated-guard.ts`（OMP 逐字移植 + T17-1
+ * Windows basename 修复）。原「简化重写」已删除：SimpleLRU、手搓 peekFile、
+ * 截断的三步整改文案、推送开关全部移除；开关语义改为 settings-pull
+ * （`edit.blockAutoGenerated`，三级回退 activeSettings → 全局 settings →
+ * schema 默认 true，refs settings-schema.ts:3230）。
+ */
+export { assertEditableFile, assertEditableFileContent, } from '../omp/tools/auto-generated-guard.ts';
+/**
+ * @deprecated 兼容旧推送式 API：守卫已改为 settings-pull（调用方传
+ * session.settings，未传时回退全局/默认），推送开关不再参与行为判定。
+ * 保留为 no-op 以兼容既有 import；src/index.ts 的调用点已删除。
+ */
+export declare function setBlockAutoGenerated(_enabled: boolean): void;

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

@@ -31,6 +31,8 @@ export declare class BunFileSliceShim extends BunFileShim {
     text(): Promise<string>;
     bytes(): Promise<Uint8Array>;
     arrayBuffer(): Promise<ArrayBuffer>;
+    /** Blob semantics: stream yields only the slice window. */
+    stream(): ReadableStream<Uint8Array>;
 }
 export declare class FileSinkShim {
     #private;
@@ -57,13 +59,46 @@ 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?: {
     compress?: 'gzip';
 }): Promise<void>;
+export declare function bunStripANSI(text: string): string;
 export interface BunShimSurface {
     file(path: string): BunFileShim;
     write(path: string, data: string | Uint8Array | Blob | ArrayBuffer): Promise<void>;
@@ -76,9 +111,10 @@ export interface BunShimSurface {
         write: typeof archiveWrite;
     };
     FileSink: typeof FileSinkShim;
-    Image: typeof BunImageUnavailable;
+    Image: typeof BunImageShim;
     CryptoHasher: typeof CryptoHasherShim;
     color(color: string, format?: string): string;
+    stripANSI(text: string): string;
     JSON: {
         parse(s: string): unknown;
         stringify(v: unknown): string;

package/lib/types/tools/shared/fs-promises-shim.d.ts

@@ -1,5 +1,7 @@
 export * from 'fs/promises';
-/** Bun's `node:fs/promises` extension: `exists(path)` → `Promise<boolean>`. */
+/** Bun's `node:fs/promises` extension: `exists(path)` → `Promise<boolean>`.
+  * Bun swallows every stat error, not just ENOENT — ENAMETOOLONG on a 60k-char
+  * path also yields false (probe audit-probes/S15/s15-exists4.ts). */
 export declare function exists(path: string): Promise<boolean>;
 /**
  * Augment the real `node:fs/promises` module type with Bun's `exists` so tsc

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

@@ -1,10 +1,15 @@
 /**
  * OMP prompt.md → DSH tool description 适配层（verbatim md 不动，适配在此）。
  *
- * OMP 的 prompts/tools/*.md 用 Handlebars 条件渲染（prompt.render），DSH 的
- * defineTool description 是静态字符串，这里提供：
- * - `renderOmpPrompt`：支持 `{{#if KEY}}A{{else}}B{{/if}}` 与
- *   `{{#if KEY}}A{{/if}}` 两种条件（md 内无嵌套、无插值变量，无需完整引擎）
+ * OMP 的 prompts/tools/*.md 用 Handlebars 条件渲染，DSH 的 defineTool
+ * description 是静态字符串，这里提供：
+ * - `renderOmpPrompt`：完全委托 OMP 自家引擎（@oh-my-pi/pi-utils 的
+ *   prompt.render = 结构化 Handlebars 解析 + post-render format 后处理，
+ *   与上游 read.ts 渲染工具描述同一条管线）。按「移植绝不允许第二套实现」
+ *   （notebook T10-1 同类教训）：自写 regex 渲染器已删除——其全文懒匹配
+ *   会跨条件边界吞并并在真值分支残留孤立 `{{/if}}`（2026-08-28 tools:sdk
+ *   "malformed prompt variable" 事故根源）。strict:false → 未传变量按 falsy
+ *   取 else 分支；畸形模板 compile 期抛错（注册期 fail-loud）。
  * - `sanitizeOmpPrompt`：按工具剔除 DSH 不适用的 OMP 提法（内部协议
  *   artifact:// ssh:// memory:// xd://、browser、scout/Task 子代理、inspect_image），
  *   全部剔除点记录在 step.md「提示词接入」节；md 源文件保持 verbatim 不变。
@@ -12,20 +17,23 @@
 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;
 }
-/** 渲染 {{#if KEY}}A{{else}}B{{/if}} 与 {{#if KEY}}A{{/if}}（不支持嵌套）。 */
+/** 渲染 {{#if KEY}}A{{else}}B{{/if}} 与 {{#if KEY}}A{{/if}}——委托 OMP 引擎
+ *  （@oh-my-pi/pi-utils prompt.render，strict:false：未传变量按 falsy 取 else
+ *  分支；畸形模板 compile 期抛错，注册期 fail-loud）。保留首尾 trim 对齐
+ *  既有调用点行为。 */
 export declare function renderOmpPrompt(text: string, vars: OmpPromptVars): string;
-/** 剔除非空白/注释行——供剔除后再次 trim。 */
-export declare function cleanLines(text: string): string;
 /** grep.md：internal URLs 提法 + scout 句剔除。 */
 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;