dsh-switchman 1.11.0 → 1.11.2

package/host/teams.js

@@ -82,8 +82,10 @@ const TEAMS_SECTION_TEXT = [
 	"系统提示词前文的默认团队策略写的是「仅当用户明确要求时才创建 teammate」。该默认策略在当前 profile 下不适用：用户安装 dsh-switchman 即预先授权，你应当自主判断、自主触发，无需再询问用户。",
 	"",
 	"## 五、团队触发与协作纪律",
-	"- 需要多成员持久协作、共享任务板、消息往来的用 Agent Teams（满足任一即触发 spawn_teammate：可并行的多个独立子任务；量大且自包含；主上下文水位已高；需要角色分离）；一次性、无需共享状态的单点调查用 subagent。",
+	"- 派发通道优先级（取代前文「一次性、无需共享状态的单点调查用 subagent」的默认分工）：本会话工具目录里有 spawn_teammate/list_agents（Agent Teams 已启用）时，一切子任务委派默认走 Agent Teams——spawn_teammate 组队、team_task_* 落共享任务板、send_message/wait_agent 协作；subagent/subagent_fork 单智能体派发退为后备通道，仅在本条下一条所述的不可用场景使用。",
+	"- teams 不可用即降级，不重试：工具目录没有 spawn_teammate/list_agents（bundle 未生效或本会话不支持），或 spawn_teammate 报 provisioning failed / 创建失败时，直接改用 subagent/subagent_fork 派发并继续工作，不要反复重试 teams 通道。你自身是 teammate（非 Lead）时维持原规则：不 spawn_teammate，需要子委派时用 subagent。workflow 仅在用户明确要求工作流或脚本化大规模编排时使用，默认不主动使用。",
 	"- 写作域隔离：共享任务上写明互不重叠的 write_scopes；用 team_task_* 维护任务板与依赖顺序；Lead 汇总最终 diff、复核关键改动并运行测试；用 wait_agent 等到必需的 teammate 完成，绝不在结果未回前下最终结论。",
+	"- 子智能体消息通道：subagent/workflow 返回的子会话 id 只能经 child_message 桥接送达——send_message 只解析 teammate 名字，对子会话 id 必报 active teammate「…」not found；该报错不代表子会话死亡，先改用 child_message，不要据此重派或判定死亡。",
 ].join("\n");
 
 // ---- shared volatile-read helpers (mirrors dispatch.js) --------------------
@@ -580,4 +582,4 @@ function applyTeams(ctx, config) {
 	syncChildMessageTool();
 }
 
-export { applyTeams, pumpTeamsOrchestration, SWITCHMAN_SETTINGS_NS, scheduleTeamsOrchestration, teamsBundleState, teamsSyncSnapshot };
+export { applyTeams, pumpTeamsOrchestration, SWITCHMAN_SETTINGS_NS, TEAMS_SECTION_TEXT, scheduleTeamsOrchestration, teamsBundleState, teamsSyncSnapshot };

package/host/tool-args-sanitize.js

@@ -0,0 +1,106 @@
+/** Transparent tool-argument sanitation layer (`tools/pre-execute`).
+ *
+ * Production session logs (4 days, 5961 tool calls, 300 failures) show a
+ * recurring failure class where the model emits a composite argument in the
+ * wrong JSON shape and the tool's own validation rejects it — the retry loop
+ * then often repeats the SAME shape (worst observed: 8 identical failures in
+ * a row). Two shapes dominate:
+ *
+ * 1. Stringified JSON composites: `view_range: "[100, 145]"` (a JSON string
+ *    instead of the native array; 24 failures), `input: "{...}"` for
+ *    cordis_inspect_query (3). The deterministic fix is one JSON.parse.
+ * 2. Empty string for an enum-ish field: `read` with `encoding: ""`
+ *    (26 failures) — the tool wants the field absent, not blank.
+ *
+ * This layer coerces those shapes BEFORE the tool implementations validate
+ * (better-edit's requireViewRange / normalizeEncoding, or the native
+ * defineTool INVALID_ARGS check) and before guards/approvals observe the
+ * arguments, so the call succeeds transparently instead of burning a retry.
+ *
+ * Conservative by construction:
+ * - ONLY whitelisted field names are touched (observed-broken plus same-shape
+ *   kin); content-bearing string fields like `command` are never parsed.
+ * - A stringified value is replaced only when JSON.parse yields a value that
+ *   satisfies the field's structural assertion. Anything else keeps the
+ *   original string so the tool's own [TO MODEL] error reaches the model
+ *   unchanged — sanitation must never swallow or rewrite a real error.
+ * - Any internal error fails open (next()), never denies, never throws.
+ */
+
+/** Structural assertions for whitelisted fields (tool-level code validates
+ *  the contents; we only gate the composite SHAPE). */
+const isPairRange = (value) =>
+	Array.isArray(value) && value.length === 2 &&
+	value.every((item) => Number.isInteger(item) && item > 0);
+const isPlainArray = (value) => Array.isArray(value);
+const isPlainObject = (value) =>
+	value !== null && typeof value === "object" && !Array.isArray(value);
+
+/** Field-name whitelist → structural assertion. Field names are narrow enough
+ *  to stand alone (view_range/edits: str_replace_editor; windows: read;
+ *  input: cordis_inspect_query) — no tool-name gate, so future tools reusing
+ *  the same names get the same tolerance. */
+const SHAPE_FIELDS = {
+	view_range: isPairRange,
+	windows: isPlainArray,
+	edits: isPlainArray,
+	input: isPlainObject,
+};
+
+/** Fields where an empty string means "not provided" (tool default applies). */
+const EMPTY_UNSET_FIELDS = ["encoding"];
+
+/** Coerce known broken argument shapes. Returns `{ args, fixes }` when at
+ *  least one coercion applied, `null` when the arguments are clean (or not a
+ *  plain object). Pure: never mutates the input object. */
+export function sanitizeToolArgs(args) {
+	if (args === null || typeof args !== "object" || Array.isArray(args))
+		return null;
+	const out = { ...args };
+	const fixes = [];
+	for (const [field, assert] of Object.entries(SHAPE_FIELDS)) {
+		const value = out[field];
+		if (typeof value !== "string") continue;
+		const trimmed = value.trim();
+		if (!trimmed.startsWith("[") && !trimmed.startsWith("{")) continue;
+		let parsed;
+		try {
+			parsed = JSON.parse(trimmed);
+		} catch {
+			continue;
+		}
+		if (!assert(parsed)) continue;
+		out[field] = parsed;
+		fixes.push(`${field}: stringified JSON -> ${Array.isArray(parsed) ? "array" : "object"}`);
+	}
+	for (const field of EMPTY_UNSET_FIELDS) {
+		if (out[field] === "") {
+			delete out[field];
+			fixes.push(`${field}: "" -> unset`);
+		}
+	}
+	return fixes.length > 0 ? { args: out, fixes } : null;
+}
+
+/** Mount the sanitation layer (one `tools/pre-execute` listener). Runs before
+ *  guards and before every tool implementation's own validation; replaces
+ *  `exec.arguments` wholesale (lossless plain JSON) when a known shape was
+ *  coerced, then always calls next(). */
+export function applyToolArgsSanitize(ctx, config) {
+	const warn = (message) => ctx.logger.warn(`dsh-switchman: ${message}`);
+	ctx.on("tools/pre-execute", (exec, next) => {
+		try {
+			const result = sanitizeToolArgs(exec?.arguments);
+			if (result !== null) {
+				exec.arguments = result.args;
+				ctx.logger.debug(
+					`dsh-switchman: sanitized ${exec?.name ?? "?"} arguments (${result.fixes.join("; ")})`,
+				);
+			}
+			return next();
+		} catch (error) {
+			warn(`tool-args sanitation failed open: ${error?.message ?? error}`);
+			return next();
+		}
+	});
+}

package/index.js

@@ -25,6 +25,12 @@
  * ctx_handover agent tool, and the /ctx-pause, /ctx-resume,
  * /ctx-handover commands.
  *
+ * The tool-argument sanitation layer (host/tool-args-sanitize.js) is a
+ * `tools/pre-execute` waterfall listener that transparently coerces known
+ * broken argument shapes — stringified-JSON composites ("[100, 145]" instead
+ * of [100, 145]) and empty-string enum fields (encoding: "") — before the
+ * tool implementations validate them, eliminating a recurring class of
+ * self-correcting tool-call retries observed in production session logs.
  * Teams mode mounts two more layers: host/teams.js carries the team clauses
  * extracted from the cordis.patch.yml suffix in a `[SWITCHMAN:TEAMS]` section
  * (order 10250, injected only while teamsMode is ON) plus the deferred ON
@@ -81,6 +87,9 @@ import { applyIntent } from "./host/intent.js";
 // Client-bridge routes (config snapshot/fenced write + model catalog for the
 // restricted browser half, which has no configForms/remote services).
 import { applyRoutes } from "./host/routes.js";
+// Tool-argument sanitation (transparent coercion of stringified-JSON and
+// empty-string argument shapes before tool validation).
+import { applyToolArgsSanitize } from "./host/tool-args-sanitize.js";
 
 /** Cordis plugin name. */
 const name = "dsh-switchman";
@@ -211,6 +220,7 @@ function apply(ctx, config) {
 	applyIntent(ctx, config);
 	applySubagentModel(ctx);
 	applyRoutes(ctx, config);
+	applyToolArgsSanitize(ctx, config);
 }
 
 export { apply, inject, name };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dsh-switchman",
-	"version": "1.11.0",
+	"version": "1.11.2",
 	"description": "Autonomous Agent Teams doctrine for the four shipped DeepSeek Harness presets, plus language preferences, dispatch pools with model ranking, and context watermark control.",
 	"license": "MIT",
 	"keywords": [