better-dsh 0.2.4-a → 0.2.4-c

package/lib/compaction/index.js

@@ -2,19 +2,6 @@ import { Context } from "@deepseek-ai/cordis";
 import z from "@deepseek-ai/schemastery";
 
 //#region src/compaction/config.ts
-/**
-* The `compaction-tuning` General-row config: the share of the routed context
-* window at which automatic condensation starts.
-*
-* Pure module — no `@deepseek-ai/*` value imports — so the host half and the
-* client half may both import it without dragging either runtime into the
-* browser bundle: the host takes the namespace and the schema defaults, the
-* client takes the namespace literal plus the stepper bounds.
-*
-* @module dashr/compaction/config
-*/
-/** The settings namespace the General row reads and writes. */
-const COMPACTION_SETTINGS_NS = "compaction-tuning";
 /** Upstream `compaction-basic`'s own default: condense at 80% of the window. */
 const DEFAULT_THRESHOLD_RATIO = .8;
 /**
@@ -47,32 +34,39 @@ const name = "dashr-compaction-tuning";
 */
 const inject = [];
 /**
-* The `compaction-tuning` settings schema.
+* The row settings schema.
 *
-* `thresholdRatio` is the field the General row drives; `retainTokens` is
-* composition-only (see {@link DEFAULT_RETAIN_TOKENS}) but still validated and
-* applied, so the recency window keeps one source of truth.
+* `thresholdRatio` is the field the General row drives and is volatile (dsh
+* 0.1.7 settings model): editing it from Settings lands as a profile-layer
+* patch override on this row and the resolved ref rewrites in place.
+* `retainTokens` is composition-only (see {@link DEFAULT_RETAIN_TOKENS}) and
+* stays non-volatile — form writes never touch it, a patch file still can.
 */
 const Config = z.object({
-	thresholdRatio: z.number().step(.01).min(THRESHOLD_MIN_RATIO).max(THRESHOLD_MAX_RATIO).default(DEFAULT_THRESHOLD_RATIO),
+	thresholdRatio: z.number().step(.01).min(THRESHOLD_MIN_RATIO).max(THRESHOLD_MAX_RATIO).default(DEFAULT_THRESHOLD_RATIO).volatile(),
 	retainTokens: z.number().step(1).min(0).default(DEFAULT_RETAIN_TOKENS)
 });
 /**
-* Install the settings namespace and keep the live compaction engine in sync.
+* Keep the live compaction engine on the user's threshold preference.
 * @param ctx - host context of the row that owns this capability.
-* @param config - composition base layer; schema defaults fill the rest.
+* @param config - resolved row config; the volatile threshold is a live ref.
 */
 function installCompactionTuning(ctx, config = defaultCompactionTuningConfig) {
 	const logger = ctx.logger("compaction-tuning");
-	let source = () => Config(config);
+	const live = () => ({
+		thresholdRatio: typeof config.thresholdRatio === "number" ? config.thresholdRatio : config.thresholdRatio.get() ?? DEFAULT_THRESHOLD_RATIO,
+		retainTokens: config.retainTokens
+	});
 	/** Smallest routed context window seen so far (advisory guard, best effort). */
 	let minWindow;
 	let probing = false;
 	/**
-	* Learn the routed context windows so a write can be refused when it would
+	* Learn the routed context windows and log when the current pairing would
 	* leave `retainTokens >= floor(window x thresholdRatio)` — the condition
 	* under which the engine raises `TargetPressureConfigError` per route and
-	* automatic condensation quietly stops for that route.
+	* automatic condensation quietly stops for that route. Advisory only: the
+	* dsh 0.1.7 settings model has no custom write-validation seam, so a bad
+	* pairing surfaces through the engine's own per-route error instead.
 	*/
 	const probeWindows = () => {
 		if (probing || minWindow !== void 0) return;
@@ -89,7 +83,10 @@ function installCompactionTuning(ctx, config = defaultCompactionTuningConfig) {
 				}
 				if (smallest !== void 0) {
 					minWindow = smallest;
-					logger.info(`smallest routed context window: ${smallest} tokens`);
+					const value = live();
+					const thresholdTokens = Math.floor(smallest * value.thresholdRatio);
+					if (value.retainTokens >= thresholdTokens) logger.warn(`retainTokens (${value.retainTokens}) is at or above the threshold tokens for the smallest routed window (${smallest} x ${value.thresholdRatio} = ${thresholdTokens}); automatic condensation will error per route until the threshold rises`);
+					else logger.info(`smallest routed context window: ${smallest} tokens`);
 				}
 			} catch (error) {
 				logger.warn(`context-window probe failed (retention guard disabled): ${error instanceof Error ? error.message : String(error)}`);
@@ -99,49 +96,38 @@ function installCompactionTuning(ctx, config = defaultCompactionTuningConfig) {
 		})();
 	};
 	/**
-	* Overwrite only this module's two fields on the engine's current policy and
-	* hand the engine a fresh frozen object.
-	* @param reason - short diagnostic tag for the log line.
+	* Hand the engine a frozen policy view carrying THIS module's two fields as
+	* getters over the live refs: every engine policy re-read (per event) sees
+	* the current General-row value with no re-apply step. Every other policy
+	* field is carried over verbatim; `retainRatio` is dropped whenever the
+	* absolute `retainTokens` is in force, because the engine treats the two as
+	* mutually exclusive. Idempotent — re-run when the engine mounts late.
 	*/
-	const push = (reason) => {
+	const installLivePolicy = (reason) => {
 		const compaction = ctx.get("compaction");
 		if (compaction === void 0) return;
 		const base = compaction.config;
 		if (base === void 0) return;
-		const value = source();
-		const next = {
+		const current = live();
+		const view = {
 			...base,
-			thresholdRatio: value.thresholdRatio,
-			retainTokens: value.retainTokens
+			get thresholdRatio() {
+				return live().thresholdRatio;
+			},
+			get retainTokens() {
+				return live().retainTokens;
+			}
 		};
-		delete next.retainRatio;
-		compaction.config = Object.freeze(next);
-		logger.info(`applied (${reason}): thresholdRatio=${value.thresholdRatio} retainTokens=${value.retainTokens}`);
+		delete view.retainRatio;
+		compaction.config = Object.freeze(view);
+		logger.info(`live policy installed (${reason}): thresholdRatio=${current.thresholdRatio} retainTokens=${current.retainTokens}`);
 	};
 	ctx.inject(["compaction"], () => {
-		push("compaction-ready");
+		installLivePolicy("compaction-ready");
 		probeWindows();
 	});
-	ctx.inject(["settings"], (settingsCtx) => {
-		if (settingsCtx.settings.get(COMPACTION_SETTINGS_NS) !== void 0) {
-			logger.info("settings namespace already served; leaving it to its owner");
-			return;
-		}
-		settingsCtx.settings.installSection(ctx, COMPACTION_SETTINGS_NS, Config, Config(config), {
-			setSource: (current) => {
-				source = current;
-			},
-			onChange: () => {
-				push("settings-updated");
-			},
-			validate: (value) => {
-				if (minWindow === void 0) return;
-				const thresholdTokens = Math.floor(minWindow * value.thresholdRatio);
-				if (value.retainTokens >= thresholdTokens) throw new Error(`retainTokens (${value.retainTokens}) must stay below the threshold tokens for every routed model; the smallest window here is ${minWindow}, so ${value.thresholdRatio} leaves only ${thresholdTokens}`);
-			}
-		});
-		push("settings-installed");
-		probeWindows();
+	ctx.inject(["settings"], (child) => {
+		child.effect(() => child.settings.configure({ auto: false }, ctx.fiber));
 	});
 }
 /** Mount the tuning as the row's whole apply (the row config is the settings base). */

package/lib/failover/index.d.ts

@@ -1,4 +1,4 @@
-import { Context } from "@deepseek-ai/cordis";
+import { Context, Volatile } from "@deepseek-ai/cordis";
 import z from "@deepseek-ai/schemastery";
 
 //#region src/failover/config.d.ts
@@ -19,12 +19,36 @@ declare const name = "dashr-failover";
  * (dormant) in compositions without a settings service.
  */
 declare const inject: string[];
-/** The `failover` settings schema: two optional fallback slots, both default "not set". */
+/**
+ * The row settings schema: two optional fallback slots, both default "not set".
+ *
+ * Both fields are volatile (dsh 0.1.7 settings model): the settings General
+ * row edits them live through `remote.settings` — the write lands as a
+ * profile-layer patch override on THIS row's entry, the runtime rewrites the
+ * resolved refs in place, and every request re-reads them without a reload.
+ */
 declare const Config: z<FailoverConfig>;
-/** Install the failover. A no-op composition degrades gracefully (empty chain = pass-through). */
-declare function installFailover(ctx: Context, config?: FailoverConfig): void;
+/**
+ * The row config as cordis hands it over post-resolution: volatile fields are
+ * live references, not plain strings.
+ */
+interface ResolvedFailoverConfig {
+  fallback1: string | Volatile<string>;
+  fallback2: string | Volatile<string>;
+}
+/**
+ * Install the failover. A no-op composition degrades gracefully (empty chain = pass-through).
+ *
+ * dsh 0.1.7 settings model: the row entry IS the settings namespace. The
+ * volatile schema fields above make it form-editable through `remote.settings`
+ * (edits persist as a profile-layer patch override via the config editor), the
+ * resolved refs re-read live per request, and the native auto-generated form
+ * is suppressed in favor of this plugin's own General row — the same shape
+ * upstream `agent-default-model` uses for its selection surface.
+ */
+declare function installFailover(ctx: Context, config?: ResolvedFailoverConfig): void;
 /** Mount the failover as the row's whole apply (the row config is the chain base). */
-declare function apply(ctx: Context, config: FailoverConfig | undefined): void;
+declare function apply(ctx: Context, config: ResolvedFailoverConfig | undefined): void;
 declare const _default: {
   name: string;
   inject: string[];
@@ -32,4 +56,4 @@ declare const _default: {
   apply: typeof apply;
 };
 //#endregion
-export { Config, apply, _default as default, inject, installFailover, name };
+export { Config, ResolvedFailoverConfig, apply, _default as default, inject, installFailover, name };

package/lib/failover/index.js

@@ -4,20 +4,6 @@ import z from "@deepseek-ai/schemastery";
 import { RetryId } from "@deepseek-ai/dsh-llm-retry";
 
 //#region src/failover/config.ts
-/**
-* The `failover` general-fallback config (host-plane, per-turn latch).
-*
-* Pure module — no `@deepseek-ai/*` value imports, so both the host module and
-* the client half may import it (the client type-only) without dragging a host
-* runtime dependency into the browser bundle.
-*
-* A route is a `provider/model` string (e.g. `deepseek/deepseek-v4-flash`).
-* The empty string `''` means "not set" — the slot is skipped.
-*
-* @module dashr/failover/config
-*/
-/** The settings namespace the General row reads and writes. */
-const FAILOVER_SETTINGS_NS = "failover";
 /** Failure codes that activate a fallback switch. */
 const FAILOVER_TRIGGER_CODES = {
 	AUTH: true,
@@ -54,11 +40,24 @@ const name = "dashr-failover";
 * (dormant) in compositions without a settings service.
 */
 const inject = [];
-/** The `failover` settings schema: two optional fallback slots, both default "not set". */
+/**
+* The row settings schema: two optional fallback slots, both default "not set".
+*
+* Both fields are volatile (dsh 0.1.7 settings model): the settings General
+* row edits them live through `remote.settings` — the write lands as a
+* profile-layer patch override on THIS row's entry, the runtime rewrites the
+* resolved refs in place, and every request re-reads them without a reload.
+*/
 const Config = z.object({
-	fallback1: z.string().default(""),
-	fallback2: z.string().default("")
+	fallback1: z.string().default("").volatile(),
+	fallback2: z.string().default("").volatile()
 });
+/** Read one field that may be a plain value (tests, defaults) or a live ref (composed row). */
+function readSlot(slot) {
+	if (typeof slot === "string") return slot;
+	const value = slot.get();
+	return typeof value === "string" ? value : "";
+}
 /** Replace provider/model on a request config, dropping the inherited reasoning effort. */
 function overrideConfig(seed, to) {
 	const { reasoningEffort: _inherited,...rest } = seed;
@@ -68,17 +67,24 @@ function overrideConfig(seed, to) {
 		model: to.model
 	};
 }
-/** Install the failover. A no-op composition degrades gracefully (empty chain = pass-through). */
+/**
+* Install the failover. A no-op composition degrades gracefully (empty chain = pass-through).
+*
+* dsh 0.1.7 settings model: the row entry IS the settings namespace. The
+* volatile schema fields above make it form-editable through `remote.settings`
+* (edits persist as a profile-layer patch override via the config editor), the
+* resolved refs re-read live per request, and the native auto-generated form
+* is suppressed in favor of this plugin's own General row — the same shape
+* upstream `agent-default-model` uses for its selection surface.
+*/
 function installFailover(ctx, config = defaultFailoverConfig) {
 	const logger = ctx.logger("llm-failover");
-	let source = () => Config(config);
-	ctx.inject(["settings"], (sctx) => {
-		sctx.settings.installSection(ctx, FAILOVER_SETTINGS_NS, Config, Config(config), {
-			setSource: (current) => {
-				source = current;
-			},
-			onChange: () => {}
-		});
+	const source = () => ({
+		fallback1: readSlot(config.fallback1),
+		fallback2: readSlot(config.fallback2)
+	});
+	ctx.inject(["settings"], (child) => {
+		child.effect(() => child.settings.configure({ auto: false }, ctx.fiber));
 	});
 	const latches = /* @__PURE__ */ new Map();
 	ctx.on("agent/disposed", ({ agent }) => {

package/lib/fs-aware/sandbox-plugin.js

@@ -6,7 +6,7 @@ import { FsError } from "@deepseek-ai/dsh-fs";
 import { writableRoots } from "@deepseek-ai/dsh-sandbox";
 import { stat } from "node:fs/promises";
 
-//#region node_modules/@deepseek-ai/dsh-fs-sandbox/lib/index.js
+//#region ../upstream/deepseek-harness/packages/fs/fs-sandbox/lib/index.js
 /**
 * Path-containment mechanics for the filesystem sandbox. Canonical spellings
 * take the fast lexical path; filesystem identity supplies the conservative

package/lib/index.js

@@ -2861,10 +2861,7 @@ function createLlmCompletionTool(deps) {
 						type: "text",
 						text: prompt
 					}],
-					source: {
-						kind: "plugin",
-						plugin: "better-dsh"
-					}
+					source: { kind: "plugin:better-dsh" }
 				})],
 				maxTokens,
 				...system !== void 0 ? { system } : {},
@@ -3528,14 +3525,14 @@ function apply(ctx, config) {
 		})) runtimeCtx.tools.register(bridgeTool);
 		runtimeCtx.tools.register(createLlmCompletionTool({ requireLlm: () => runtimeCtx.get("llm") }));
 		const wireMasked = /* @__PURE__ */ new WeakSet();
-		runtimeCtx.on("agent/session-start", ({ agent }) => {
-			if (wireMasked.has(agent)) return;
+		runtimeCtx.on("agent/created", ({ agent }) => {
+			if (wireMasked.has(agent)) return void 0;
 			wireMasked.add(agent);
 			try {
 				captureAllTools(runtimeCtx, agent);
 				const visible = new Set(agent.ctx.tools.schemas(agent).map((schema) => schema.name));
 				const deny = [...WIRE_MASKED_NAMES].filter((name$1) => visible.has(name$1));
-				if (deny.length === 0) return;
+				if (deny.length === 0) return void 0;
 				try {
 					agent.ctx.tools.restrict({ deny });
 					return;

package/lib/mobile/plugin.d.ts

@@ -1,4 +1,4 @@
-import { r as MobileConfig } from "../web-trust-CgpBoFv3.js";
+import { r as MobileConfig } from "../web-trust-BihHCelF.js";
 import { Context } from "@deepseek-ai/cordis";
 import z from "@deepseek-ai/schemastery";
 

package/lib/remote/plugin.d.ts

@@ -0,0 +1,24 @@
+import { Context } from "@deepseek-ai/cordis";
+import z from "@deepseek-ai/schemastery";
+
+//#region src/remote/plugin.d.ts
+
+declare const name = "dashr-remote";
+declare const inject: string[];
+/** 运行参数旋钮（Ruling P18）：无别名表面——容器一律显式 'docker:' / 'incus:' 前缀。 */
+interface RemoteRowConfig {
+  execTimeoutSec: number;
+  idleTtlSec: number;
+  maxOutputChars: number;
+}
+declare const Config: z<RemoteRowConfig>;
+/** MUST stay an arrow（RM0 plugin.ts 同注：function 声明会被 cordis 当构造器 new 掉，返回的 disposer 丢失）。 */
+declare const apply: (ctx: Context, config: RemoteRowConfig) => (() => void);
+declare const _default: {
+  name: string;
+  inject: string[];
+  Config: z<RemoteRowConfig>;
+  apply: (ctx: Context, config: RemoteRowConfig) => (() => void);
+};
+//#endregion
+export { Config, RemoteRowConfig, apply, _default as default, inject, name };