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

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/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/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/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;
@@ -96,6 +98,7 @@ 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>;
@@ -111,6 +114,7 @@ export interface BunShimSurface {
     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/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 不变。
@@ -19,10 +24,11 @@ export interface OmpPromptVars {
     /** 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 句剔除。 */

package/lib/types/tools/shared/session-state.d.ts

@@ -21,7 +21,10 @@
 export interface OmpSessionState {
     /** 冲突注册表（read 注册 / write 消费）。 */
     conflictHistory?: unknown;
-    /** hashline 快照存储（read 锚点 / edit 校验；预留，暂未接入）。 */
+    /**
+     * hashline 快照存储（read 锚点 / edit seen-lines 校验 / 锚点漂移恢复；
+     * A-4 桥接，与 conflictHistory 对称：attach/persist round-trip）。
+     */
     fileSnapshotStore?: unknown;
 }
 /** 取（或惰性建）某个 DSH session 的 OMP 状态。 */
@@ -32,12 +35,15 @@ export declare function getOmpSessionState(sessionKey: object): OmpSessionState;
  */
 export declare function attachOmpSessionState(session: {
     conflictHistory?: unknown;
+    fileSnapshotStore?: unknown;
 }, sessionKey: object | undefined): void;
 /**
  * 把 ToolSession 上引擎新建/更新的状态写回共享存储（execute 结束后调用）。
- * OMP 引擎惰性创建 ConflictHistory 并赋到 session 对象上，必须回写才能
- * 被下一次调用恢复。
+ * OMP 引擎会惰性新建 ConflictHistory / fileSnapshotStore 并赋到 session
+ * 对象上（如 read.ts 经 getFileSnapshotStore 挂快照库），必须回写才能被
+ * 下一次调用恢复。
  */
 export declare function persistOmpSessionState(sessionKey: object | undefined, session: {
     conflictHistory?: unknown;
+    fileSnapshotStore?: unknown;
 }): void;