dsh-patch-edit-plus 0.1.2 → 0.2.0

package/README.md

@@ -6,11 +6,10 @@ Patch-style file editing for [DeepSeek Harness (DSH)](https://github.com/deepsee
 
 | DSH version | Status | Notes |
 |---|---|---|
-| `0.1.2-rc.1` | ✅ supported | Tool authoring contract (`defineTool` DSL, presentation intents) is byte-identical across 0.1.2–0.1.5; one code path serves both. |
-| `0.1.3-alpha.x` | ✅ supported | Same as above. |
-| `0.1.5-rc.2` | ✅ statically verified | `npm run typecheck:0.1.5` typechecks `src/` against the real `0.1.5-rc.2` peer packages. No `readByteRange` usage, no 0.1.5-only PTC identifiers. |
+| `0.1.7-rc.1+` | ✅ supported (this line, v0.2.0+) | Declarative settings: `allowCodexPatch` is marked `.volatile()` — the settings form renders automatically and `loader/volatile-update` re-registers the tool without a remount. No registration call. |
+| `0.1.2-rc.1` ~ `0.1.5-rc.2` | ↗ maintenance line | Served by the pre-0.1.7 branch / `dsh-0.1.5` dist-tag. 0.1.7 removed the imperative settings APIs the dual-API fallback relied on, so one codebase cannot serve both. |
 
-Settings registration uses the dual-API fallback (`settings.installSection` on 0.1.2+, `settings.register` on older hosts).
+Settings are declarative on this line: fields marked `.volatile()` in `Config` become the settings form; the plugin subscribes to `loader/volatile-update` instead of receiving registration hooks.
 
 ## Why patch at all? (tool routing guide)
 

package/README.zh.md

@@ -6,11 +6,10 @@
 
 | DSH 版本 | 状态 | 说明 |
 |---|---|---|
-| `0.1.2-rc.1` | ✅ 支持 | 工具编写契约（`defineTool` DSL、presentation 视图）在 0.1.2–0.1.5 间逐字节未变，单一代码路径服务两个版本。 |
-| `0.1.3-alpha.x` | ✅ 支持 | 同上。 |
-| `0.1.5-rc.2` | ✅ 静态核验 | `npm run typecheck:0.1.5` 用真实 `0.1.5-rc.2` peer 包对 `src/` 做类型核验；不调用 `readByteRange`，不含 0.1.5-only PTC 字符串。 |
+| `0.1.7-rc.1+` | ✅ 支持（本线，v0.2.0+） | 声明式设置：`allowCodexPatch` 标记 `.volatile()`——设置表单自动生成，`loader/volatile-update` 驱动工具原位重注册（不 remount），无任何注册调用。 |
+| `0.1.2-rc.1` ~ `0.1.5-rc.2` | ↗ 维护线 | 由 0.1.7 前的分支 / `dsh-0.1.5` dist-tag 服务。0.1.7 删除了双 API 回退所依赖的命令式注册 API，一份代码无法同时兼容两代。 |
 
-settings 注册走双 API 回退：0.1.2+ 的 `settings.installSection` 优先，旧版回退 `settings.register`。
+本线的 settings 是声明式的：`Config` 中标记 `.volatile()` 的字段即设置表单；插件订阅 `loader/volatile-update`，不再接收注册 hooks。
 
 ## 工具路由指引（为什么该用谁）
 

package/lib/config.js

@@ -12,7 +12,7 @@ export const Config = z.object({
     conflictPolicy: z.union(['rename', 'skip', 'fail']).default('rename'),
     renameSuffix: z.string().default('_1'),
     allowUnifiedDiff: z.boolean().default(true),
-    allowCodexPatch: z.boolean().default(false),
+    allowCodexPatch: z.boolean().default(false).volatile(),
     deleteBackend: z.union(['shell', 'none']).default('shell'),
     shellDialect: z.union(['auto', 'posix', 'pwsh']).default('auto'),
     deleteCommand: z.string(),
@@ -23,6 +23,14 @@ export const Config = z.object({
     maxPatchBytes: z.number().step(1).min(1024).default(512 * 1024),
     maxDiffBytes: z.number().step(1).min(256).default(16 * 1024),
 });
+/** Read a `.volatile()` field: a live ref on 0.1.7+, a plain boolean otherwise. */
+export function readVolatileBoolean(value, fallback) {
+    if (typeof value === 'boolean')
+        return value;
+    if (value && typeof value.get === 'function')
+        return Boolean(value.get());
+    return fallback;
+}
 /** Fill user config with defaults; `undefined`/null entries fall back too. */
 export function resolveConfig(config) {
     const c = config ?? {};
@@ -31,7 +39,7 @@ export function resolveConfig(config) {
         conflictPolicy: c.conflictPolicy ?? 'rename',
         renameSuffix: typeof c.renameSuffix === 'string' ? c.renameSuffix : '_1',
         allowUnifiedDiff: c.allowUnifiedDiff ?? true,
-        allowCodexPatch: c.allowCodexPatch ?? false,
+        allowCodexPatch: readVolatileBoolean(c.allowCodexPatch, false),
         deleteBackend: c.deleteBackend ?? 'shell',
         shellDialect: c.shellDialect ?? 'auto',
         deleteCommand: typeof c.deleteCommand === 'string' && c.deleteCommand !== '' ? c.deleteCommand : undefined,

package/lib/index.js

@@ -4,14 +4,15 @@
  * One `apply_patch` tool accepting git/unified diff (default) and Codex
  * `apply_patch` syntax (opt-in). All-or-nothing application through the
  * official fs write-intent dance; delete/move through the sandbox-aware
- * shell. Compatible with DSH 0.1.2-rc.1 through 0.1.5-rc.2: the tool
- * authoring contract is byte-identical across those versions, so a single
- * code path serves both; only settings registration needs the dual-API
- * fallback (`installSection` first, `register` second).
+ * shell. Targets DSH 0.1.7+: settings are declarative — the fields marked
+ * `.volatile()` in `Config` render the settings form automatically (no
+ * registration call), and `loader/volatile-update` drives re-registration
+ * without a plugin remount. This line drops the pre-0.1.7 hosts; the
+ * 0.1.2-rc.1 ~ 0.1.5-rc.2 line stays on its maintenance branch.
  *
  * @module dsh-patch-edit-plus
  */
-import { Config, resolveConfig } from './config.js';
+import { resolveConfig } from './config.js';
 import { registerApplyPatchTool } from './register.js';
 /** Cordis plugin name used by Loader diagnostics. */
 export const name = 'dsh-patch-edit-plus';
@@ -31,26 +32,21 @@ export const name = 'dsh-patch-edit-plus';
  * in every profile that has no shell capability.
  */
 export const inject = ['tools', 'fs'];
+export { Config } from './config.js';
 /**
- * Settings namespace. Must match dsh-settings `NAMESPACE_PATTERN`
- * (`/^[a-z][a-z0-9-]*$/`) on every target version: letters, digits and
- * hyphens only — an underscore made `register()` throw before anything
- * persisted, so no migration is needed.
+ * Register the tool from the current config snapshot.
+ *
+ * 登记级 key。工具「描述」把可用语法固化进去了（tool.ts 拼 `Accepts ${styles}`），
+ * 所以判定必须覆盖整份 resolved config，而不是只看 allowCodexPatch。
  */
-export const SETTINGS_NAMESPACE = 'patch-edit-plus';
-export { Config };
-/** Register the tool and the settings namespace. Every registration is scoped to this plugin. */
 export function apply(ctx, config) {
+    // 组合条目（0.1.7 起 volatile 字段在其中是 live 引用）：rejudge 每次整体
+    // 重解析一次，一次调用内是同一份快照；跨调用的最新值由事件驱动重取。
     const compositionEntry = config ?? {};
-    // 权威来源：设置层挂载时是解析后的 scope，否则是组合条目。
-    // installSection 保证在每次匹配的 onChange 之前先调用 setSource（attach 与 detach 各一次）。
-    let readSource = () => compositionEntry;
     let disposer = null;
-    // 登记级 key。工具「描述」把可用语法固化进去了（tool.ts 拼 `Accepts ${styles}`），
-    // 所以判定必须覆盖整份 resolved config，而不是只看 allowCodexPatch。
     let registeredKey = null;
     const rejudge = () => {
-        const next = resolveConfig(readSource());
+        const next = resolveConfig(compositionEntry);
         const key = JSON.stringify(next);
         if (key === registeredKey)
             return;
@@ -66,23 +62,9 @@ export function apply(ctx, config) {
             registeredKey = null;
         };
     });
-    ctx.inject(['settings'], (settingsCtx) => {
-        const settings = settingsCtx.settings
-            ?? settingsCtx;
-        if (typeof settings?.installSection === 'function') {
-            settings.installSection(ctx, SETTINGS_NAMESPACE, Config, compositionEntry, {
-                setSource: (current) => { readSource = current; },
-                onChange: () => { rejudge(); },
-            });
-            return;
-        }
-        if (typeof settings?.register === 'function') {
-            const scope = settings.register(SETTINGS_NAMESPACE, Config, { base: compositionEntry });
-            if (scope !== undefined) {
-                readSource = () => scope.get();
-                scope.watch(() => { rejudge(); });
-                rejudge();
-            }
-        }
+    // 0.1.7+: 只有 volatile 字段变更才走这里（不 remount）；普通字段变更会整体
+    // remount 插件，新一次 `apply` 自然读到全部新值。等值变更宿主不通知。
+    ctx.on('loader/volatile-update', () => {
+        rejudge();
     });
 }

package/lib/types/config.d.ts

@@ -6,6 +6,7 @@
  * @module dsh-patch-edit-plus/config
  */
 import z from '@deepseek-ai/schemastery';
+import type { Volatile } from '@deepseek-ai/cosmokit';
 /** What to do when the configured tool name is already taken at registration. */
 export type ConflictPolicy = 'rename' | 'skip' | 'fail';
 /** Backend used for Delete/Move operations (`ctx.fs` has no delete/move). */
@@ -22,8 +23,10 @@ export interface Config {
     renameSuffix?: string;
     /** Accept git/unified diff patches. Defaults to true. */
     allowUnifiedDiff?: boolean;
-    /** Accept Codex `apply_patch` syntax. Defaults to false. */
-    allowCodexPatch?: boolean;
+    /** Accept Codex `apply_patch` syntax. Defaults to false.
+     * 0.1.7 `.volatile()`: the loader hands `apply` a live `Volatile` ref for this
+     * field — always read it through `readVolatileBoolean`, never cache the ref. */
+    allowCodexPatch?: boolean | Volatile<boolean>;
     /** Delete/Move backend. Defaults to `shell`. `none` rejects Delete/Move with a structured error. */
     deleteBackend?: DeleteBackend;
     /** Shell dialect for the constant delete/move templates. Defaults to `auto` (pwsh on win32). */
@@ -44,7 +47,37 @@ export interface Config {
     maxDiffBytes?: number;
 }
 /** Schemastery schema for Loader defaults and generated configuration docs. */
-export declare const Config: z<Config>;
+export declare const Config: z<Schemastery.ObjectS<NoInfer<{
+    toolName: z<string, string, "defined">;
+    conflictPolicy: z<"rename" | "skip" | "fail", "rename" | "skip" | "fail", "defined">;
+    renameSuffix: z<string, string, "defined">;
+    allowUnifiedDiff: z<boolean, boolean, "defined">;
+    allowCodexPatch: z<boolean, boolean, "volatile-defined">;
+    deleteBackend: z<"shell" | "none", "shell" | "none", "defined">;
+    shellDialect: z<"auto" | "posix" | "pwsh", "auto" | "posix" | "pwsh", "defined">;
+    deleteCommand: z<string, string, "plain">;
+    moveCommand: z<string, string, "plain">;
+    dryRunByDefault: z<boolean, boolean, "defined">;
+    followSymlinks: z<boolean, boolean, "defined">;
+    maxFiles: z<number, number, "defined">;
+    maxPatchBytes: z<number, number, "defined">;
+    maxDiffBytes: z<number, number, "defined">;
+}>>, Schemastery.ObjectT<NoInfer<{
+    toolName: z<string, string, "defined">;
+    conflictPolicy: z<"rename" | "skip" | "fail", "rename" | "skip" | "fail", "defined">;
+    renameSuffix: z<string, string, "defined">;
+    allowUnifiedDiff: z<boolean, boolean, "defined">;
+    allowCodexPatch: z<boolean, boolean, "volatile-defined">;
+    deleteBackend: z<"shell" | "none", "shell" | "none", "defined">;
+    shellDialect: z<"auto" | "posix" | "pwsh", "auto" | "posix" | "pwsh", "defined">;
+    deleteCommand: z<string, string, "plain">;
+    moveCommand: z<string, string, "plain">;
+    dryRunByDefault: z<boolean, boolean, "defined">;
+    followSymlinks: z<boolean, boolean, "defined">;
+    maxFiles: z<number, number, "defined">;
+    maxPatchBytes: z<number, number, "defined">;
+    maxDiffBytes: z<number, number, "defined">;
+}>>, "plain">;
 /** Fully-resolved configuration used by the tool body. */
 export interface ResolvedConfig {
     toolName: string;
@@ -62,5 +95,7 @@ export interface ResolvedConfig {
     maxPatchBytes: number;
     maxDiffBytes: number;
 }
+/** Read a `.volatile()` field: a live ref on 0.1.7+, a plain boolean otherwise. */
+export declare function readVolatileBoolean(value: boolean | Volatile<boolean> | undefined, fallback: boolean): boolean;
 /** Fill user config with defaults; `undefined`/null entries fall back too. */
 export declare function resolveConfig(config: Config | undefined): ResolvedConfig;

package/lib/types/index.d.ts

@@ -4,16 +4,21 @@
  * One `apply_patch` tool accepting git/unified diff (default) and Codex
  * `apply_patch` syntax (opt-in). All-or-nothing application through the
  * official fs write-intent dance; delete/move through the sandbox-aware
- * shell. Compatible with DSH 0.1.2-rc.1 through 0.1.5-rc.2: the tool
- * authoring contract is byte-identical across those versions, so a single
- * code path serves both; only settings registration needs the dual-API
- * fallback (`installSection` first, `register` second).
+ * shell. Targets DSH 0.1.7+: settings are declarative — the fields marked
+ * `.volatile()` in `Config` render the settings form automatically (no
+ * registration call), and `loader/volatile-update` drives re-registration
+ * without a plugin remount. This line drops the pre-0.1.7 hosts; the
+ * 0.1.2-rc.1 ~ 0.1.5-rc.2 line stays on its maintenance branch.
  *
  * @module dsh-patch-edit-plus
  */
 import type { Context } from '@deepseek-ai/cordis';
-import { Config } from './config.js';
 import type { Config as PluginConfig } from './config.js';
+declare module '@deepseek-ai/cordis' {
+    interface Events {
+        'loader/volatile-update': (paths: string[]) => void;
+    }
+}
 /** Cordis plugin name used by Loader diagnostics. */
 export declare const name = "dsh-patch-edit-plus";
 /**
@@ -32,13 +37,11 @@ export declare const name = "dsh-patch-edit-plus";
  * in every profile that has no shell capability.
  */
 export declare const inject: string[];
+export { Config } from './config.js';
 /**
- * Settings namespace. Must match dsh-settings `NAMESPACE_PATTERN`
- * (`/^[a-z][a-z0-9-]*$/`) on every target version: letters, digits and
- * hyphens only — an underscore made `register()` throw before anything
- * persisted, so no migration is needed.
+ * Register the tool from the current config snapshot.
+ *
+ * 登记级 key。工具「描述」把可用语法固化进去了（tool.ts 拼 `Accepts ${styles}`），
+ * 所以判定必须覆盖整份 resolved config，而不是只看 allowCodexPatch。
  */
-export declare const SETTINGS_NAMESPACE = "patch-edit-plus";
-export { Config };
-/** Register the tool and the settings namespace. Every registration is scoped to this plugin. */
 export declare function apply(ctx: Context, config?: PluginConfig): void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-patch-edit-plus",
-  "version": "0.1.2",
-  "description": "Patch-style file editing for DeepSeek Harness: one apply_patch tool accepting git/unified diff (default) and Codex apply_patch syntax (opt-in), with all-or-nothing application, read-before-write intent dance, sandbox-aware delete/move, and 0.1.2-rc.1 ~ 0.1.5-rc.2 compatibility.",
+  "version": "0.2.0",
+  "description": "Patch-style file editing for DeepSeek Harness: one apply_patch tool accepting git/unified diff (default) and Codex apply_patch syntax (opt-in), with all-or-nothing application, read-before-write intent dance, sandbox-aware delete/move, with a DSH 0.1.7+ line (declarative volatile settings).",
   "type": "module",
   "repository": {
     "type": "git",
@@ -47,7 +47,7 @@
   },
   "engines": {
     "node": ">=20",
-    "dsh": ">=0.1.2-rc.1 <0.2.0-0"
+    "dsh": ">=0.1.7-rc.1 <0.2.0-0"
   },
   "license": "MIT",
   "keywords": [
@@ -62,10 +62,10 @@
   ],
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-fs": ">=0.1.2-rc.1",
-    "@deepseek-ai/dsh-sandbox": ">=0.1.2-rc.1",
-    "@deepseek-ai/dsh-shell": ">=0.1.2-rc.1",
-    "@deepseek-ai/dsh-tools": ">=0.1.2-rc.1"
+    "@deepseek-ai/dsh-fs": ">=0.1.7-rc.1 <0.2.0-0",
+    "@deepseek-ai/dsh-sandbox": ">=0.1.7-rc.1 <0.2.0-0",
+    "@deepseek-ai/dsh-shell": ">=0.1.7-rc.1 <0.2.0-0",
+    "@deepseek-ai/dsh-tools": ">=0.1.7-rc.1 <0.2.0-0"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/cordis": {
@@ -85,7 +85,7 @@
     }
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.2"
+    "@deepseek-ai/schemastery": "^3.18.4"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
@@ -98,6 +98,10 @@
     "eslint": "^9.0.0",
     "typescript": "^5.6.0",
     "typescript-eslint": "^8.0.0",
-    "vitest": "^3.0.0"
+    "vitest": "^3.0.0",
+    "@deepseek-ai/schemastery": "^3.18.4"
+  },
+  "publishConfig": {
+    "tag": "dsh-0.1.7"
   }
 }