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

package/lib/types/config/fields.d.ts

@@ -64,7 +64,7 @@ export interface ToolPlusTab {
     fields: readonly string[];
 }
 /** Identifiers of every tool tab. */
-export type ToolPlusToolId = 'bash' | 'read' | 'writeEdit' | 'grep' | 'astGrep' | 'astEdit' | 'readImage';
+export type ToolPlusToolId = 'bash' | 'read' | 'writeEdit' | 'grep' | 'astGrep' | 'astEdit';
 /** Field group ids -> locale key of the group heading. */
 export declare const TOOL_PLUS_GROUP_LABELS: Record<string, BashPlusLocaleKey>;
 /**

package/lib/types/config/settings.d.ts

@@ -75,6 +75,7 @@ export interface RuntimeConfig {
     readDefaultLimit: number;
     readLineNumbers: boolean;
     readRenderMarkdown: boolean;
+    readConcurrentSafe: boolean;
     grepContextBefore: number;
     grepContextAfter: number;
     astGrepEnabled: boolean;
@@ -82,13 +83,27 @@ export interface RuntimeConfig {
     fetchEnabled: boolean;
     fetchMaxTimeoutSeconds: number;
     imagesAutoResize: boolean;
-    inspectImageMode: string;
+    imagesBlockImages: boolean;
+    imagesExcludeWebp: boolean;
+    imagesInputMaxBytes: number;
+    imagesResizeMaxSide: number;
+    imagesResizeMaxBytes: number;
+    imagesResizeMinSide: number;
+    imagesResizeJpegQuality: number;
 }
 /** Settings namespace of this plugin, served to the web Plugins page. */
 export declare const BASH_PLUS_SETTINGS_NS: import("@deepseek-ai/dsh-settings").SettingsNamespace;
 /** OMP-parity defaults for the completion-message truncation policy. */
 export declare const DEFAULT_OUTPUT_TRUNCATE: OutputTruncateConfig;
-/** OMP-parity defaults for the timing knobs (timeouts in ms; OMP uses seconds). */
+/**
+ * Timing knobs (ms). DEFAULT_MAX_TIMEOUT_MS is OMP-parity (= upstream bash
+ * per-tool max 3600s); DEFAULT_TIMEOUT_MS was deliberately relaxed from
+ * 300_000 to 3_600_000 with the bash-plus settings card (763023e,
+ * 2026-08-19) — NOT OMP-parity (OMP bash default is 300s), compensated by
+ * auto-backgrounding after DEFAULT_AUTO_BACKGROUND_MS. By design there is no
+ * upstream `tools.maxTimeout` global-cap equivalent: maxTimeoutMs always
+ * applies. (second-impl-audit.md S-11 终局, 2026-08-29.)
+ */
 export declare const DEFAULT_TIMEOUT_MS = 3600000;
 export declare const DEFAULT_MAX_TIMEOUT_MS = 3600000;
 export declare const DEFAULT_AUTO_BACKGROUND_MS = 60000;
@@ -136,6 +151,7 @@ export interface Config {
     readDefaultLimit?: number;
     readLineNumbers?: boolean;
     readRenderMarkdown?: boolean;
+    readConcurrentSafe?: boolean;
     grepContextBefore?: number;
     grepContextAfter?: number;
     astGrepEnabled?: boolean;
@@ -143,7 +159,13 @@ export interface Config {
     fetchEnabled?: boolean;
     fetchMaxTimeoutSeconds?: number;
     imagesAutoResize?: boolean;
-    inspectImageMode?: 'auto' | 'on' | 'off';
+    imagesBlockImages?: boolean;
+    imagesExcludeWebp?: boolean;
+    imagesInputMaxBytes?: number;
+    imagesResizeMaxSide?: number;
+    imagesResizeMaxBytes?: number;
+    imagesResizeMinSide?: number;
+    imagesResizeJpegQuality?: number;
 }
 /**
  * Runtime configuration schema for the plugin. The namespace resolves through

package/lib/types/config/truncate.d.ts

@@ -1,9 +1,13 @@
 /**
- * Config-driven output truncation for background→foreground completion text,
- * ported verbatim in behavior from the OMP bash-runtime
- * `applyConfiguredTruncation` (index.ts). Pure functions over a policy value —
- * no plugin state — so the ported runtime files stay pristine and the
- * `bash-plus` settings surface drives this module.
+ * Config-driven output truncation for background→foreground completion text.
+ * Provenance (second-impl-audit.md S-1, 2026-08-29): the truncation
+ * primitives (truncateHead/Middle/Tail, TruncationResult) are OMP 17.3.5
+ * verbatim, imported directly from `../omp/session/streaming-output.ts`;
+ * the composition layer below (trigger threshold + retention mode + notice
+ * format) is a plugin-specific design shipped with the bash-plus settings
+ * card (763023e, 2026-08-19) — `applyConfiguredTruncation` has no
+ * counterpart in refs/oh-my-pi 17.3.5, so the old "ported verbatim from the
+ * OMP bash-runtime" claim was unverifiable and has been dropped.
  * @module @xiaoso/dsh-tool-plus/truncate
  */
 import type { OutputTruncateConfig } from './settings.ts';

package/lib/types/tools/bash/background.d.ts

@@ -24,7 +24,7 @@ export interface StartBashJobOptions {
     sessionId: string;
     command: string;
     cwd: string;
-    /** Effective deadline in ms; `undefined` disables the job deadline. */
+    /** Effective deadline in ms; `undefined`/0 disables the job deadline. */
     timeoutMs: number | undefined;
     /** Command-scoped environment (already merged with dshEnv). */
     env: Record<string, string> | undefined;

package/lib/types/tools/bash/bash-executor.d.ts

@@ -63,6 +63,8 @@ export interface BashResult {
     output: string;
     exitCode: number | undefined;
     cancelled: boolean;
+    /** True when the command was killed by its timeout deadline (not a user abort). */
+    timedOut?: boolean;
     truncated: boolean;
     totalLines: number;
     totalBytes: number;
@@ -91,4 +93,6 @@ export interface BashResult {
 export declare function closeSessionShells(sessionId: string): void;
 /** Translate `ShellMinimizerSettings` into native `MinimizerOptions`, or `undefined` when disabled. */
 export declare function buildMinimizerOptions(group: ShellMinimizerSettings): MinimizerOptions | undefined;
+export declare function needsInteractiveShellArg(shell: string): boolean;
+export declare function ensureInteractiveShellArgs(shell: string, args: string[]): string[];
 export declare function executeBash(command: string, options?: BashExecutorOptions): Promise<BashResult>;

package/lib/types/tools/bash/bash-interceptor.d.ts

@@ -1,10 +1,3 @@
-/**
- * Bash intent interceptor - redirects common shell patterns to proper tools.
- *
- * When an LLM calls bash with patterns like `grep`, `cat`, `find`, etc.,
- * this interceptor provides helpful error messages directing them to use
- * the specialized tools instead.
- */
 export interface BashInterceptorRule {
     pattern: string;
     flags?: string;
@@ -12,6 +5,15 @@ export interface BashInterceptorRule {
     message: string;
     allowSubcommands?: string[];
 }
+/**
+ * 规则表对齐上游 refs/oh-my-pi/packages/coding-agent/src/config/settings-schema.ts:325-387（10 条）。
+ * 既有 6 条（read/grep/glob/edit×3）语义与消息文案保持不变；新增 echo/printf 重定向 → write（上游 :356-367）。
+ * hub 类 3 条（nohup/后台语法、dev/start 服务、--watch，上游 :368-386）按映射决策加入：
+ * pattern 逐字照抄；tool hub → bash（DSH 等价受管机制 = bash 工具 run_in_background:true，
+ * startBashJob → jobs 注册表 → job_output 读输出 / job_kill 停止）；文案改写为 run_in_background 引导。
+ * DSH 无 hub 的 stdin-send/restart/跨实例观察能力，属有意不移植。
+ * `bashInterceptor.patterns` 配置键不在本次范围，未引入。
+ */
 export declare const DEFAULT_BASH_INTERCEPTOR_RULES: BashInterceptorRule[];
 export interface InterceptionResult {
     /** If true, the bash command should be blocked */
@@ -28,4 +30,4 @@ export interface InterceptionResult {
  * @param availableTools Set of tool names that are available
  * @returns InterceptionResult indicating if the command should be blocked
  */
-export declare function checkBashInterception(command: string, availableTools: string[], rules?: BashInterceptorRule[]): InterceptionResult;
+export declare function checkBashInterception(command: string, availableTools: string[], rules?: BashInterceptorRule[], originalCommand?: string): InterceptionResult;

package/lib/types/tools/bash/cd-workdir.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Leading `cd <path> && …` workdir extraction and `~` expansion for the bash
+ * tool.
+ *
+ * Extraction delegates to `extractLeadingCdTarget` (shell-tokenize.ts, verbatim
+ * port of upstream tools/shell-tokenize.ts), so redirect prefixes, extra
+ * arguments, command substitution, and unterminated quotes all bail and leave
+ * the whole command with the shell. `~`/`~/…` prefixes expand against
+ * `os.homedir()` with upstream `expandTilde` semantics
+ * (refs packages/coding-agent/src/tools/path-utils.ts).
+ * @module @xiaoso/dsh-tool-plus/bash/cd-workdir
+ */
+/**
+ * Expand a leading `~`/`~/…`/`~\…` prefix to the home directory, matching
+ * upstream `expandTilde` (refs tools/path-utils.ts). A bare `~name` is joined
+ * under the home directory like upstream (user-home approximation).
+ */
+export declare function expandTilde(filePath: string, home?: string): string;
+/** A leading `cd <path> && …` split into its (tilde-expanded) workdir and the remainder. */
+export interface CdWorkdir {
+    /** Tilde-expanded working directory for the leading `cd`. */
+    workdir: string;
+    /** Command remainder after the top-level `&&`. */
+    command: string;
+}
+/**
+ * Extract a leading `cd <path> && …` prefix, expanding `~` in the target.
+ *
+ * Returns `null` when the command does not start with exactly `cd`, one path
+ * token, and a top-level `&&` — redirects (`cd /tmp 2>/dev/null && …`), extra
+ * arguments, command substitution (`$`, backticks, `(`), and unterminated
+ * quotes all leave the whole command for the shell instead of absorbing shell
+ * syntax into the structured workdir seam.
+ */
+export declare function extractCdWorkdir(command: string, home?: string): CdWorkdir | null;

package/lib/types/tools/bash/non-interactive-env.d.ts

@@ -1,3 +1,5 @@
+/** Portable command that rejects credential prompts without assuming an FHS layout. */
+export declare const REJECT_PROMPT_COMMAND: string;
 export declare const NON_INTERACTIVE_ENV: Readonly<Record<string, string>>;
 /** Builds the per-command environment for non-interactive child processes. */
 export declare function buildNonInteractiveEnv(overrides?: Record<string, string>, baseEnv?: Record<string, string | undefined>, platform?: NodeJS.Platform): Record<string, string>;

package/lib/types/tools/bash/render.d.ts

@@ -17,9 +17,10 @@ export declare function formatWallTimeNotice(wallTimeMs: number): string;
  * middle elision, shown range for one-sided truncation) plus elided stats,
  * then the spill-file pointer and a read-back hint. Range reconstruction rides
  * the shared OMP algorithm (`outputMeta().truncationFromSummary`), with the
- * upstream `artifact://` clause replaced by the filesystem path — DSH has no
- * artifact URL space, and the read tool's `:N-M` inline selectors take their
- * place.
+ * upstream `artifact://N` clause replaced by the spill-file path — bash spill
+ * files are plain files (deliberately not registered in the read tool's
+ * artifact:// space, see adapter/spill.ts) and are recovered with `:N-M`
+ * inline selectors instead.
  * @returns the notice lines, or `undefined` when output was not truncated.
  */
 export declare function formatTruncationNotice(value: CollectedOutput): string[] | undefined;

package/lib/types/tools/bash/sanitize-text.d.ts

@@ -8,6 +8,11 @@
  * malformed path; when it changes the input, replacement characters are
  * dropped and the normalized result goes through the well-formed sanitizer.
  *
+ * S-8 normalization: ANSI stripping re-exports the ECMA-48 state machine from
+ * `src/tools/shared/bun-shim.ts` — the same function installed as
+ * `Bun.stripANSI`; `toWellFormed()` delegates to the native
+ * `String.prototype.toWellFormed`.
+ *
  * Fast path: well-formed input with no controls or ANSI returns the original
  * string after the control probe.
  */

package/lib/types/tools/bash/shell-snapshot.d.ts

@@ -18,8 +18,11 @@ export declare function sanitizeSnapshotForBrush(content: string): {
 /**
  * Create a shell snapshot, caching the result.
  * Returns the path to the snapshot file, or null if creation failed.
+ *
+ * `timeoutMs` is configurable so callers exercising failure handling do not
+ * have to wait out the production startup budget.
  */
-export declare function getOrCreateSnapshot(shell: string, env: Record<string, string | undefined>): Promise<string | null>;
+export declare function getOrCreateSnapshot(shell: string, env: Record<string, string | undefined>, timeoutMs?: number): Promise<string | null>;
 /**
  * Delete every cached snapshot file and clear the cache. Called from the
  * plugin's disposal path (the pi-gateway original ran this through its

package/lib/types/tools/bash/shell-tokenize.d.ts

@@ -0,0 +1,60 @@
+/**
+ * Conservative shell command tokenizer shared by the bash approval-pattern
+ * matcher and the gh-cache invalidator.
+ *
+ * Splits a bash command into independent command segments, each a list of word
+ * tokens. Handles single/double-quoted strings, backslash escapes, and the
+ * standard operators (`;`, `&&`, `||`, `|`, `&`, `(`, `)`, newlines) as segment
+ * boundaries so callers treat the pieces as independent command sequences.
+ *
+ * It is deliberately not a full POSIX parser — heredocs, command substitution,
+ * and arithmetic expansion are out of scope; callers fall through when they
+ * cannot find the structure they need.
+ */
+export declare function tokenizeShellSegments(command: string): string[][];
+/**
+ * A flat shell command segment with the context needed to decide interception.
+ *
+ * @see extractFlatShellCommandSegments
+ */
+interface FlatShellCommandSegment {
+    /** Original segment text with quoting and escaping preserved. */
+    text: string;
+    /**
+     * True when this segment consumes the previous stage's stdout via an
+     * unquoted `|` or `|&`. Blank and comment-only continuation lines preserve
+     * the pending pipe state. Such a stage reads piped stdin, so path-based
+     * dedicated tools (read/grep/glob) cannot replace it. `||`, `;`, `&`, and
+     * `&&` start an independent command and leave this false.
+     */
+    pipedStdin: boolean;
+}
+/**
+ * Returns the flat shell command segments with the original text of each. Unlike
+ * `tokenizeShellSegments`, this preserves quoting and escaping so the results
+ * are safe to match against user-configured regular expressions, and flags
+ * segments that receive piped stdin.
+ *
+ * The extractor deliberately declines to split syntax whose execution context
+ * cannot be determined with this small scanner (heredocs, command substitution,
+ * backticks, grouping, and malformed quoting). Callers must still check the
+ * complete input in that case.
+ */
+export declare function extractFlatShellCommandSegments(command: string): FlatShellCommandSegment[];
+/**
+ * Parses a leading `cd <path> && ...` prefix so the bash tool can route the
+ * target through its structured `cwd` parameter when the model omits it.
+ *
+ * Returns the single path token (quotes and backslash escapes resolved to their
+ * literal value) and the command remainder after the top-level `&&`, or `null`
+ * when the command does not begin with exactly `cd`, one path token, and a
+ * top-level `&&`. The scanner deliberately bails on anything else in the prefix
+ * — redirects (`cd /tmp 2>/dev/null && ...`), extra arguments, or paths needing
+ * shell expansion (`$`, backticks, `(`) — leaving the whole command for the
+ * shell instead of absorbing shell syntax into `cwd`.
+ */
+export declare function extractLeadingCdTarget(command: string): {
+    path: string;
+    rest: string;
+} | null;
+export {};

package/lib/types/tools/bash/streaming-output.d.ts

@@ -1,232 +1,32 @@
-export declare const DEFAULT_MAX_LINES = 3000;
-export declare const DEFAULT_MAX_BYTES: number;
-export declare const DEFAULT_MAX_COLUMN = 512;
+import { OutputSink as VerbatimOutputSink, OutputSummary as VerbatimOutputSummary, type OutputSinkOptions } from "../omp/session/streaming-output.ts";
+export * from "../omp/session/streaming-output.ts";
 /**
- * Default artifact-on-disk cap for {@link OutputSink}.
- *
- * `0` means unbounded: by default, `artifact://<id>` references preserve the
- * complete raw stream instead of a capped head/tail sample.
+ * Verbatim `OutputSummary` 加 DSH 增量字段 `artifactPath`。
  */
-export declare const ARTIFACT_DEFAULT_MAX_BYTES = 0;
-/** Default head budget; the remainder becomes the rolling tail window. */
-export declare const ARTIFACT_DEFAULT_HEAD_BYTES: number;
-export interface OutputSummary {
-    output: string;
-    truncated: boolean;
-    totalLines: number;
-    totalBytes: number;
-    outputLines: number;
-    outputBytes: number;
-    /** Bytes elided from the middle when head-retain mode is active. */
-    elidedBytes?: number;
-    /** Lines elided from the middle when head-retain mode is active. */
-    elidedLines?: number;
-    /** Bytes dropped by the per-line column cap (sum across all lines). */
-    columnDroppedBytes?: number;
-    /** Number of distinct lines that hit the per-line column cap. */
-    columnTruncatedLines?: number;
-    /** Configured per-line column cap in effect (chars), when > 0. */
-    columnMax?: number;
-    /** Artifact ID for internal URL access (artifact://<id>) when truncated */
-    artifactId?: string;
+export interface OutputSummary extends VerbatimOutputSummary {
     /**
      * Path of the spill file mirroring the raw stream, when one was created.
      * Present even when only the per-line column cap triggered mirroring.
      */
     artifactPath?: string;
 }
-export interface OutputSinkOptions {
-    artifactPath?: string;
-    artifactId?: string;
-    /** Tail buffer budget (bytes). Default DEFAULT_MAX_BYTES. */
-    spillThreshold?: number;
-    /**
-     * When > 0, the sink keeps the first `headBytes` of output in addition to
-     * the rolling tail window. Output between the two windows is elided
-     * (middle elision). Default 0 = tail-only behavior.
-     */
-    headBytes?: number;
-    /**
-     * Per-line byte cap. When > 0, lines wider than `maxColumns` bytes are
-     * truncated with an ellipsis at write time; remaining bytes up to the next
-     * `\n` are dropped. Cap state persists across chunks so split-mid-line
-     * writes still respect the budget. Default 0 = no per-line cap.
-     */
-    maxColumns?: number;
-    onChunk?: (chunk: string) => void;
-    /** Minimum ms between onChunk calls. 0 = every chunk (default). */
-    chunkThrottleMs?: number;
-    /**
-     * Optional cap on bytes written to the artifact-on-disk file. When the cap
-     * is hit, the head window is preserved verbatim and subsequent output feeds
-     * a rolling tail window; on close, the sink writes a single
-     * `[ARTIFACT TRUNCATED: …]` notice between them. Default
-     * {@link ARTIFACT_DEFAULT_MAX_BYTES} (unbounded).
-     */
-    artifactMaxBytes?: number;
-    /**
-     * Bytes reserved for the head window of the capped artifact file. The
-     * tail window receives `artifactMaxBytes - artifactHeadBytes`. Default
-     * {@link ARTIFACT_DEFAULT_HEAD_BYTES}; clamped to `[0, artifactMaxBytes]`.
-     */
-    artifactHeadBytes?: number;
-}
-export interface TruncationResult {
-    content: string;
-    truncated?: boolean;
-    truncatedBy?: "lines" | "bytes" | "middle";
-    totalLines: number;
-    totalBytes: number;
-    outputLines?: number;
-    outputBytes?: number;
-    /** Bytes elided from the middle (truncateMiddle only). */
-    elidedBytes?: number;
-    /** Lines elided from the middle (truncateMiddle only). */
-    elidedLines?: number;
-    lastLinePartial?: boolean;
-    firstLineExceedsLimit?: boolean;
-}
-export interface TruncationOptions {
-    /** Maximum number of lines (default: 3000) */
-    maxLines?: number;
-    /** Maximum number of bytes (default: 50KB) */
-    maxBytes?: number;
-    /**
-     * For `truncateMiddle`: bytes reserved for the head window. The tail
-     * window receives `maxBytes - maxHeadBytes`. Default `floor(maxBytes/2)`.
-     */
-    maxHeadBytes?: number;
-    /**
-     * For `truncateMiddle`: lines reserved for the head window. The tail
-     * window receives `maxLines - maxHeadLines`. Default `floor(maxLines/2)`.
-     */
-    maxHeadLines?: number;
-}
-/** Result from byte-level truncation helpers. */
-export interface ByteTruncationResult {
-    text: string;
-    bytes: number;
-}
-export interface TailTruncationNoticeOptions {
-    fullOutputPath?: string;
-    originalContent?: string;
-    suffix?: string;
-}
-export interface HeadTruncationNoticeOptions {
-    startLine?: number;
-    totalFileLines?: number;
-}
-/**
- * Truncate a string/buffer to fit within a byte limit, keeping the tail.
- * Handles multi-byte UTF-8 boundaries correctly.
- */
-export declare function truncateTailBytes(data: string | Uint8Array, maxBytes: number): ByteTruncationResult;
-/**
- * Truncate a string/buffer to fit within a byte limit, keeping the head.
- * Handles multi-byte UTF-8 boundaries correctly.
- */
-export declare function truncateHeadBytes(data: string | Uint8Array, maxBytes: number): ByteTruncationResult;
-/**
- * Truncate a single line to max characters, appending '…' if truncated.
- */
-export declare function truncateLine(line: string, maxChars?: number): {
-    text: string;
-    wasTruncated: boolean;
-};
-/** Shared helper to build a no-truncation result. */
-export declare function noTruncResult(content: string, totalLines?: number, totalBytes?: number): TruncationResult;
-/**
- * Truncate content from the head (keep first N lines/bytes).
- * Never returns partial lines. If the first line exceeds the byte limit,
- * returns empty content with firstLineExceedsLimit=true.
- *
- * This implementation avoids Buffer.from(content) for the whole input.
- * It only computes UTF-8 byteLength for candidate lines that can still fit.
- */
-export declare function truncateHead(content: string, options?: TruncationOptions): TruncationResult;
-/**
- * Truncate content from the tail (keep last N lines/bytes).
- * May return a partial first line if the last line exceeds the byte limit.
- *
- * Also avoids Buffer.from(content) for the whole input.
- */
-export declare function truncateTail(content: string, options?: TruncationOptions): TruncationResult;
-/**
- * Format the inline marker substituted for the elided middle region.
- * Returned without surrounding newlines so callers can position it freely.
- */
-export declare function formatMiddleElisionMarker(elidedLines: number, elidedBytes: number): string;
-/**
- * Truncate content keeping a head window and a tail window, eliding the middle.
- *
- * The combined output is `<head>\n<marker>\n<tail>` when truncation is needed.
- * `maxHeadBytes` defaults to `floor(maxBytes / 2)`; the tail receives the
- * remainder. Falls back to `truncateTail` / `truncateHead` if either side's
- * budget is empty or the content already fits.
- */
-export declare function truncateMiddle(content: string, options?: TruncationOptions): TruncationResult;
-/** Options for {@link enforceInlineByteCap}. */
-export interface InlineByteCapOptions {
-    /** Inline byte budget. Defaults to {@link DEFAULT_MAX_BYTES}. */
-    maxBytes?: number;
-    /**
-     * Persist the full text as a session artifact. When an artifact id is
-     * returned, a `[raw output: artifact://<id>]` footer is appended so the
-     * elided bytes stay recoverable.
-     */
-    saveArtifact?: (full: string) => string | undefined | Promise<string | undefined>;
+export declare class OutputSink extends VerbatimOutputSink {
+    #private;
+    constructor(options?: OutputSinkOptions);
+    dump(notice?: string): Promise<OutputSummary>;
 }
 /**
- * Final-defense inline size guard for tool results.
- *
- * No-op when `text` fits within `maxBytes` (the common path). Otherwise keeps
- * ~60% of the budget from the head and ~25% from the tail — cut on line
- * boundaries, never splitting a multi-byte UTF-8 sequence — with an elision
- * marker between. The remaining ~15% is slack for the marker and the optional
- * `[raw output: artifact://<id>]` footer, so the result stays under `maxBytes`.
+ * Composition wrapper over the verbatim {@link TailBuffer}, adding the DSH
+ * `reset()` increment. The verbatim class keeps its state in private fields,
+ * so reset is modeled as a fresh window with the same budget.
  */
-export declare function enforceInlineByteCap(text: string, options: InlineByteCapOptions): Promise<string>;
 export declare class TailBuffer {
     #private;
     readonly maxBytes: number;
     constructor(maxBytes: number);
     append(text: string): void;
     text(): string;
+    bytes(): number;
     /** Drop all held output; the next {@link append} starts a fresh window. */
     reset(): void;
-    bytes(): number;
 }
-export declare class OutputSink {
-    #private;
-    constructor(options?: OutputSinkOptions);
-    /**
-     * Push a chunk of output. The buffer management and onChunk callback run
-     * synchronously. File sink writes are deferred and serialized internally.
-     */
-    push(chunk: string): void;
-    createInput(): WritableStream<Uint8Array | string>;
-    /**
-     * Replace the in-memory buffer with the given text. Used when an upstream
-     * minimizer rewrites the captured output after the raw bytes have already
-     * been streamed.
-     *
-     * After this call the buffer is authoritative: streaming counters realign
-     * to the replacement, the retained head window is cleared, and head
-     * retention is disabled so subsequent `push()` calls append directly to the
-     * tail buffer instead of repopulating the (now meaningless) head window
-     * — which would otherwise reorder content and trip the middle-elision
-     * branch in `dump()` against stale totals.
-     */
-    replace(text: string): void;
-    dump(notice?: string): Promise<OutputSummary>;
-}
-/**
- * Format a truncation notice for tail-truncated output (bash, python, ssh).
- * Returns empty string if not truncated.
- */
-export declare function formatTailTruncationNotice(truncation: TruncationResult, options?: TailTruncationNoticeOptions): string;
-/**
- * Format a truncation notice for head-truncated output (read tool).
- * Returns empty string if not truncated.
- */
-export declare function formatHeadTruncationNotice(truncation: TruncationResult, options?: HeadTruncationNoticeOptions): string;

package/lib/types/tools/bash/which.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Minimal PATH (+ PATHEXT on Windows) executable lookup, standing in for
+ * `Bun.which` / pi-utils `$which` on the Node runtime.
+ *
+ * Why this exists: pi-utils' `$which` calls `Bun.which` at module top level
+ * (node_modules @oh-my-pi/pi-utils src/which.ts:196), which the bun-shim does
+ * not provide — so DSH code that must resolve executables the way OMP does
+ * (procmgr `resolveWindowsShell` for shell discovery, `REJECT_PROMPT_COMMAND`
+ * in non-interactive-env) uses this scanner instead. Single implementation —
+ * any new caller resolves executables through here, never hand-rolls a PATH
+ * walk.
+ * @module @xiaoso/dsh-tool-plus/bash/which
+ */
+/**
+ * Resolve `command` against PATH the way `Bun.which` would: absolute/relative
+ * candidates are returned as-is when they name an existing file; bare names
+ * are looked up in each PATH dir (appending PATHEXT extensions on win32, in
+ * order). Returns the first existing regular file, or `undefined`.
+ */
+export declare function findOnPath(command: string, env?: NodeJS.ProcessEnv): string | undefined;

package/lib/types/tools/bash/windows-shell.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Windows shell discovery, ported from oh-my-pi procmgr's `resolveWindowsShell`
+ * (refs/oh-my-pi/packages/utils/src/procmgr.ts:148-173) — adapted verbatim:
+ * `Bun.env` → injectable Node env (default `process.env`), and pi-utils
+ * `$which` → `findOnPath` (src/tools/bash/which.ts).
+ *
+ * Deliberately NOT ported from procmgr: buildSpawnEnv, shell prefix handling,
+ * direnv integration, and PI_SHELL_PREFIX — DSH has no shell-prefix seam;
+ * commands run inside the embedded brush shell or the resolved user shell.
+ * @module @xiaoso/dsh-tool-plus/bash/windows-shell
+ */
+/**
+ * Resolve the external shell to advertise on Windows.
+ *
+ * A host bash is OPTIONAL: bash tool commands always execute in the embedded
+ * brush-core shell. The resolved binary only serves the spawn-a-shell paths,
+ * so this prefers a real Git Bash when one exists and otherwise falls back to
+ * cmd.exe — it never fails.
+ *
+ * Search order:
+ * 1. Git for Windows install roots (machine + per-user installers)
+ * 2. scoop installs — scoop's git manifest sets GIT_INSTALL_ROOT and shims
+ *    sh.exe/git.exe but never bash.exe, so PATH lookup alone misses it
+ * 3. bash.exe on PATH (Cygwin, MSYS2, ...)
+ * 4. sh.exe on PATH (Git for Windows' sh.exe is bash; prefer a sibling
+ *    bash.exe when present)
+ * 5. cmd.exe from ComSpec
+ *
+ * Exported for tests; `env` overrides process.env-based discovery.
+ */
+export declare function resolveWindowsShell(env?: NodeJS.ProcessEnv): string;

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

@@ -1,14 +1,16 @@
 /**
  * DSH edit tool — adapter that wires the verbatim OMP edit engine
- * (`src/tools/edit/omp/`) into DSH's `defineTool` contract.
+ * (`src/tools/omp/edit/`) into DSH's `defineTool` contract.
  *
  * This file is pure glue. All edit logic lives in `omp/` (copied verbatim);
  * this adapter only:
  *  - builds an OMP `ToolSession` from the DSH exec context + tool-plus config,
  *  - picks the edit mode from the call shape (replace / patch / hashline /
  *    apply_patch), exactly like OMP's `EditTool.mode` resolution,
- *  - dispatches to the OMP execute functions and converts the
- *    `AgentToolResult` back to a DSH tool result.
+ *  - hands replace/apply_patch to the verbatim upstream dispatch layer
+ *    (`omp/edit/dispatch.ts`，A-7/A-8：resolveEditPath 路径纠错 +
+ *    executeSinglePathEntries / executeApplyPatchPerFile 聚合) and converts
+ *    the `AgentToolResult` back to a DSH tool result.
  *
  * LSP/ACP/TUI are absent in DSH (plan.md 拍板#5/#8): writethrough writes through
  * ctx.fs, diagnostics are never produced, and no TUI rendering happens.
@@ -16,6 +18,13 @@
 import type { Context } from '@deepseek-ai/cordis';
 import type { WritethroughCallback } from '../../omp/tools/writethrough.ts';
 import type { RuntimeConfig } from '../../../config/settings.ts';
+/** OMP 原版按模式渲染的 edit 描述（prompts/tools/*.md verbatim + hashline 引擎 prompt.md）。 */
+export declare const EDIT_MODE_DESCRIPTIONS: {
+    readonly replace: string;
+    readonly patch: string;
+    readonly apply_patch: string;
+    readonly hashline: string;
+};
 /** File-write channel for DSH (方案A, 2026-08-27): every edit mode funnels
  * through `ctx.fs` with the per-call sandbox policy resolved from the session
  * (official tool-fs semantics). The OMP engines pass a `file` handle for
@@ -25,6 +34,19 @@ import type { RuntimeConfig } from '../../../config/settings.ts';
  * was denied by the deployment fallback. Both defects are fixed here: the
  * handle is ignored and the policy is always attached. */
 export declare function createWritethrough(ctx: Context, exec: any): WritethroughCallback;
+/** DSH edit 工具输出形状（output.schema 镜像）。 */
+export interface EditToolOutput {
+    text: string;
+}
+/**
+ * S-13：edit.fuzzyThreshold 解析——上游 settings 面原样放行显式 0/负值
+ * （0 = 接受任意置信度的最佳匹配，refs edit/index.ts:112 同款语义），仅
+ * undefined/非数值回退引擎默认 0.95。env 层（上游 PI_EDIT_FUZZY* 环境变量
+ * 串解析）有意不移植：DSH 无该环境变量面，面板字段是唯一入口。
+ */
+export declare function resolveFuzzyThreshold(raw: unknown): number;
+/** 完整执行链路（defineTool.execute 与单测共用，镜像 read 的 executeReadTool）。 */
+export declare function executeEditTool(exec: any, cfg: RuntimeConfig, args: any, ctx: Context | null): Promise<EditToolOutput>;
 /**
  * Register the edit tool. Mode is resolved per call from the argument shape
  * (matching OMP's mode dispatch):