@mengyuly/dsh-ponytail 0.1.2 → 0.1.3

package/README.md

@@ -16,7 +16,10 @@ dsh plugin --profile web add link:$(pwd)
 dsh plugin --profile web add github:MengYuil/dsh-ponytail
 
 # 方式三：Release 打包件（先下 tgz）
-dsh plugin --profile web add file:./mengyuly-dsh-ponytail-0.1.2.tgz
+dsh plugin --profile web add file:./mengyuly-dsh-ponytail-0.1.3.tgz
+
+# 方式四：npm
+dsh plugin --profile web add @mengyuly/dsh-ponytail
 ```
 
 装完重启 profile 生效（`dsh web` / `dsh tui`）。装载完成后，会话技能目录里会出现 6 个 `ponytail*` 技能，发 `/ponytail-help` 立即验证。
@@ -28,17 +31,21 @@ dsh plugin --profile web add file:./mengyuly-dsh-ponytail-0.1.2.tgz
 ## 功能
 
 - **核心模式** `/ponytail` — 每轮注入「懒惰阶梯」：能不做就不做（YAGNI）→ 代码库已有 → 标准库 → 平台原生 → 已装依赖 → 一行能解决 → 才是最少代码。
-  - `full`（默认）/ `lite` / `ultra` / `off` 四档，会话级。
-  - `/ponytail default <mode>` 持久化默认值。
+  - `full`（默认）/ `lite` / `ultra` / `off` 四档，**会话级**（会话 A 的档位不影响会话 B，会话结束自动释放）。
+  - 裸 `/ponytail`：已启用时只报告；会话为 `off` 时恢复到有效默认档（有效默认也是 `off` 则回 `full`）。
+  - `/ponytail status`：只查询、永不修改。
+  - `/ponytail lite|full|ultra|off`：显式切换。
+  - `/ponytail default <mode>`：持久化默认值到配置文件（环境变量仍优先）。
 - **一次性技能**（用哪个载哪个，不进常驻 prompt）：
   - `/ponytail-review` — 针对最近改动找过度工程，一行一条：位置 + 删什么 + 替代。
   - `/ponytail-audit` — 全仓库过度工程审计，排序清单。
   - `/ponytail-debt` — 收割所有 `ponytail:` 注释成债务账本。
   - `/ponytail-gain` — 收益计分板（更少代码/更省成本/更快）。
   - `/ponytail-help` — 参考卡。
-- **停用**：说 `stop ponytail` 或 `normal mode`；随时 `/ponytail` 恢复。
-- **默认值**：环境变量 `PONYTAIL_DEFAULT_MODE` > `~/.config/ponytail/config.json` 的 `{"defaultMode": "lite"}` > `full`。
+- **停用**：说 `stop ponytail` 或 `normal mode`（兼容中英文句末标点）；随时 `/ponytail` 恢复。
+- **默认值**：环境变量 `PONYTAIL_DEFAULT_MODE` > `~/.config/ponytail/config.json`（Windows：`%APPDATA%\ponytail\config.json`）的 `{"defaultMode": "lite"}` > `full`。`/ponytail default` 写入的是配置文件，**环境变量设置且合法时仍压过保存值**（命令会分别提示 saved 与 effective）。
 - **子代理**：常驻段作用于当前会话自身；DSH 内置 `subagent` 工具跑的是隔离的全新子代理、不继承本 persona。`PONYTAIL_SUBAGENT_MATCHER`（匹配子代理 `agentPreset` 的正则）用于在 harness 会下发给子代理的场景里排除指定子代理；缺省全部注入。
+- **配置错误**：非法 JSON / 非法 `defaultMode` / 读取失败 / 非法正则只告警一次（不刷屏）；配置文件不存在属正常、不告警；热更新遇到临时非法内容保留上一个合法默认值。
 
 ## 效率
 
@@ -53,6 +60,11 @@ dsh plugin --profile web add file:./mengyuly-dsh-ponytail-0.1.2.tgz
 - 配置文件的默认档位热更新（fs 轮询 ~1s，作用于无覆盖的会话）；环境变量改动仍需重启。
 - 发行 `lib/` 是预编译产物；改源码请回主仓重建后同步。
 
+## 测试环境与权威关系
+
+- 用 Node.js **v24.16.0** 在本机 deepseek-harness checkout 上测试（`tsc -b` + `tsdown` host 构建通过）。与之精确匹配的已发布 DSH/Cordis 版本**待确认**——checkout 是预发布工作树，非发布 tag。
+- 权威源码在 deepseek-harness monorepo 的 `packages/community/ponytail`（`@deepseek-ai/dsh-ponytail`）；本仓库（`@mengyuly/dsh-ponytail`）是**发行镜像**：随包附构建产物，`scripts/build.sh` 只做源码类型检查，不是独立真源。
+
 ## 许可
 
 MIT，© 2026 DietrichGebert（上游）+ MengYuil（移植）。详见 [LICENSE](LICENSE)。

package/lib/index.js

@@ -1,6 +1,6 @@
 import { createRequire } from "node:module";
 import { Service } from "@deepseek-ai/cordis";
-import { mkdirSync, readFileSync, unwatchFile, watchFile, writeFileSync } from "node:fs";
+import { mkdirSync, readFileSync, renameSync, unlinkSync, unwatchFile, watchFile, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 //#region ../../llm/llm/src/brand.ts
@@ -2007,7 +2007,9 @@ You can also load any of these with the \`skill\` tool.
 
 ## Deactivate
 
-Say "stop ponytail" or "normal mode". Resume anytime with \`/ponytail\`.
+Say "stop ponytail" or "normal mode". Resume anytime with \`/ponytail\` —
+it re-enables at the effective default (or \`full\` when that is off too).
+\`/ponytail status\` only shows the current level, never changes it.
 \`/ponytail off\` also works. Level is session-scoped; a new session starts
 from the configured default.
 
@@ -2027,7 +2029,8 @@ export PONYTAIL_DEFAULT_MODE=ultra
 
 Set \`"off"\` to disable auto-activation on session start, activate manually
 with \`/ponytail\` when wanted. \`/ponytail default <mode>\` persists a new
-default from inside a session.
+default to the config file; an exported \`PONYTAIL_DEFAULT_MODE\` still
+outranks the saved value for new sessions.
 
 Resolution: env var > config file > \`full\`.
 
@@ -2140,7 +2143,7 @@ function normalizeRuntimeMode(mode) {
 * toggle".
 */
 function isDeactivationCommand(text) {
-	const normalized = (typeof text === "string" ? text : "").trim().toLowerCase().replace(/[.!?\s]+$/, "");
+	const normalized = (typeof text === "string" ? text : "").trim().toLowerCase().replace(/[\s.!?。？！]+$/, "");
 	return normalized === "stop ponytail" || normalized === "normal mode";
 }
 /** Config directory: `$XDG_CONFIG_HOME/ponytail`, `%APPDATA%\ponytail`, else `~/.config/ponytail`. */
@@ -2154,38 +2157,70 @@ function configPath(env = process.env) {
 	return join(configDir(env), "config.json");
 }
 /**
-* Resolve a default from the environment value, then a parsed config document,
-* then {@link DEFAULT_MODE}. Pure so callers can supply fixtures.
+* Read the configured default with diagnostics: environment variable first,
+* then the config file, then `full`. A missing config file is normal and
+* yields no issue; a broken one yields the fallback mode plus one issue for
+* the caller to warn about once.
 */
-function resolveDefaultMode(envMode, configText) {
-	const fromEnv = normalizeRuntimeMode(envMode);
-	if (fromEnv) return fromEnv;
-	if (configText !== void 0) try {
-		const config = JSON.parse(stripBom(configText));
-		if (config && typeof config === "object" && !Array.isArray(config)) {
-			const fromConfig = normalizeRuntimeMode(config.defaultMode);
-			if (fromConfig) return fromConfig;
+function readDefaultModeInfo(env = process.env) {
+	const path = configPath(env);
+	const envMode = normalizeRuntimeMode(env.PONYTAIL_DEFAULT_MODE);
+	let configText;
+	try {
+		configText = readFileSync(path, "utf8");
+	} catch (error) {
+		if (error.code === "ENOENT") return { mode: envMode ?? "full" };
+		return {
+			mode: envMode ?? "full",
+			issue: {
+				kind: "read",
+				detail: `${path}: ${error.message}`
+			}
+		};
+	}
+	let configIssue;
+	let fromConfig = null;
+	try {
+		const parsed = JSON.parse(stripBom(configText));
+		if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) configIssue = {
+			kind: "shape",
+			detail: `${path}: root must be a JSON object`
+		};
+		else if ("defaultMode" in parsed) {
+			fromConfig = normalizeRuntimeMode(parsed.defaultMode);
+			if (!fromConfig) configIssue = {
+				kind: "value",
+				detail: `${path}: defaultMode is not lite|full|ultra|off`
+			};
 		}
-	} catch {}
-	return DEFAULT_MODE;
+	} catch (error) {
+		configIssue = {
+			kind: "json",
+			detail: `${path}: ${error.message}`
+		};
+	}
+	if (envMode) return {
+		mode: envMode,
+		...configIssue ? { issue: configIssue } : {}
+	};
+	if (configIssue) return {
+		mode: DEFAULT_MODE,
+		issue: configIssue
+	};
+	return { mode: fromConfig ?? "full" };
 }
 /**
 * Read the configured default for this host: environment variable first, then
 * the config file, then `full`.
 */
 function readDefaultMode(env = process.env) {
-	const path = configPath(env);
-	let configText;
-	try {
-		configText = readFileSync(path, "utf8");
-	} catch {
-		configText = void 0;
-	}
-	return resolveDefaultMode(env.PONYTAIL_DEFAULT_MODE, configText);
+	return readDefaultModeInfo(env).mode;
 }
 /**
 * Persist a new default level to the config file, preserving other fields.
 * Returns the normalized mode, or `null` when the value is not a runtime mode.
+* Throws when the write itself fails, so callers never report success for a
+* file that was not written.
 */
 function writeDefaultMode(mode, env = process.env) {
 	const normalized = normalizeRuntimeMode(mode);
@@ -2197,8 +2232,18 @@ function writeDefaultMode(mode, env = process.env) {
 		if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) config = parsed;
 	} catch {}
 	config.defaultMode = normalized;
+	const text = `${JSON.stringify(config, null, 2)}\n`;
 	mkdirSync(dirname(path), { recursive: true });
-	writeFileSync(path, `${JSON.stringify(config, null, 2)}\n`, "utf8");
+	const temp = join(dirname(path), `.config-${process.pid}-${Date.now()}.tmp`);
+	try {
+		writeFileSync(temp, text, "utf8");
+		renameSync(temp, path);
+	} catch (error) {
+		try {
+			unlinkSync(temp);
+		} catch {}
+		throw new Error(`failed to write ${path}: ${error.message}`);
+	}
 	return normalized;
 }
 /**
@@ -2222,18 +2267,37 @@ var ModeStore = class {
 	}
 };
 /**
-* Compile `PONYTAIL_SUBAGENT_MATCHER` into a case-insensitive regex, or `null`
-* — for "no matcher" and for invalid patterns, both of which mean the ruleset
-* applies to every agent (fail open, like upstream).
+* Compile `PONYTAIL_SUBAGENT_MATCHER` into a case-insensitive regex. An unset
+* matcher yields `null`; an invalid pattern stays fail-open (every agent gets
+* the ruleset) but is reported so the caller can warn exactly once.
 */
 function compileSubagentMatcher(raw) {
-	if (!raw) return null;
+	if (!raw) return {
+		matcher: null,
+		invalid: false
+	};
 	try {
-		return new RegExp(raw, "i");
+		return {
+			matcher: new RegExp(raw, "i"),
+			invalid: false
+		};
 	} catch {
-		return null;
+		return {
+			matcher: null,
+			invalid: true
+		};
 	}
 }
+/**
+* The stable per-session identity backing every mode override. DSH's `Agent`
+* type documents `id` as "the single identity shared with session", so the
+* agent id IS the SessionId: one entry per live session, never shared between
+* two sessions, and stable across the session's lifetime. Centralized so the
+* key choice lives in exactly one place.
+*/
+function sessionKey(agent) {
+	return agent.id;
+}
 /** Whether a session is a subagent child (origin, or any delegation depth with no origin). */
 function isSubagentSession(header) {
 	return header.origin === "subagent" || (header.delegationDepth ?? 0) > 0;
@@ -2331,7 +2395,7 @@ function containsDeactivation(messages) {
 }
 /** Mode visible to one agent: its session override, else the configured default. */
 function modeFor(deps, agent) {
-	return deps.store.modeFor(String(agent.id), deps.defaultMode());
+	return deps.store.modeFor(sessionKey(agent), deps.defaultMode());
 }
 /**
 * Queue one skill's full `<skill_content>` rendering as the model's next
@@ -2369,21 +2433,46 @@ function registerCommands(deps, commandCtx) {
 	commandCtx.commands.register({
 		name: "ponytail",
 		description: "Set or show Ponytail lazy senior dev intensity",
-		input: { hint: "[lite|full|ultra|off|default <mode>]" },
+		input: { hint: "[status|default <mode>|lite|full|ultra|off]" },
 		handler: ({ agent, rawInput }) => {
 			const input = rawInput.trim().toLowerCase();
 			const [head, ...rest] = input.split(/\s+/).filter(Boolean);
 			if ((head ?? "") === "default") {
-				const written = writeDefaultMode(rest[0]);
+				let written;
+				try {
+					written = writeDefaultMode(rest[0]);
+				} catch (error) {
+					return {
+						kind: "error",
+						text: `Failed to save default: ${error.message}`
+					};
+				}
 				if (!written) return {
 					kind: "error",
 					text: "Usage: /ponytail default [lite|full|ultra|off]"
 				};
-				deps.setDefault(written);
+				const effective = readDefaultMode();
+				deps.setDefault(effective);
+				if (written === effective) {
+					agent.steer(createUserMessage({
+						content: [{
+							type: "text",
+							text: `PONYTAIL DEFAULT SET — new sessions start in ${written}.`
+						}],
+						source: {
+							kind: "plugin",
+							plugin: name
+						}
+					}));
+					return {
+						kind: "success",
+						text: `Ponytail default set — new sessions start in ${written}.`
+					};
+				}
 				agent.steer(createUserMessage({
 					content: [{
 						type: "text",
-						text: `PONYTAIL DEFAULT SET — new sessions start in ${written}.`
+						text: `PONYTAIL DEFAULT SET — saved ${written}, effective ${effective} (PONYTAIL_DEFAULT_MODE).`
 					}],
 					source: {
 						kind: "plugin",
@@ -2392,11 +2481,50 @@ function registerCommands(deps, commandCtx) {
 				}));
 				return {
 					kind: "success",
-					text: `Ponyytail default set — new sessions start in ${written}.`
+					text: `Saved default: ${written}. Effective default: ${effective}, overridden by PONYTAIL_DEFAULT_MODE.`
 				};
 			}
+			if (input === "status") return {
+				kind: "success",
+				text: `Ponytail mode: ${modeFor(deps, agent)}. Use /ponytail lite|full|ultra|off.`
+			};
 			if (input === "") {
 				const current = modeFor(deps, agent);
+				const effectiveDefault = deps.defaultMode();
+				if (current === "off") {
+					if (effectiveDefault === "off") {
+						deps.store.set(sessionKey(agent), "full");
+						agent.steer(createUserMessage({
+							content: [{
+								type: "text",
+								text: "PONYTAIL MODE CHANGED — level: full"
+							}],
+							source: {
+								kind: "plugin",
+								plugin: name
+							}
+						}));
+						return {
+							kind: "success",
+							text: "Ponytail re-enabled at full (the effective default is off)."
+						};
+					}
+					deps.store.clear(sessionKey(agent));
+					agent.steer(createUserMessage({
+						content: [{
+							type: "text",
+							text: `PONYTAIL MODE ACTIVE — level: ${effectiveDefault}`
+						}],
+						source: {
+							kind: "plugin",
+							plugin: name
+						}
+					}));
+					return {
+						kind: "success",
+						text: `Ponytail re-enabled. Effective default: ${effectiveDefault}.`
+					};
+				}
 				agent.steer(createUserMessage({
 					content: [{
 						type: "text",
@@ -2415,9 +2543,9 @@ function registerCommands(deps, commandCtx) {
 			const mode = normalizeRuntimeMode(input);
 			if (!mode) return {
 				kind: "error",
-				text: "Usage: /ponytail [lite|full|ultra|off]"
+				text: "Usage: /ponytail [status|default <mode>|lite|full|ultra|off]"
 			};
-			deps.store.set(String(agent.id), mode);
+			deps.store.set(sessionKey(agent), mode);
 			agent.steer(createUserMessage({
 				content: [{
 					type: "text",
@@ -2464,18 +2592,42 @@ function descriptionFor(skill) {
 */
 function apply(ctx) {
 	let defaultMode = null;
-	const readDefault = () => defaultMode ??= readDefaultMode();
+	const warned = /* @__PURE__ */ new Set();
+	const warnOnce = (key, message) => {
+		if (warned.has(key)) return;
+		warned.add(key);
+		ctx.logger.warn(`[ponytail] ${message}`);
+	};
+	const refreshDefault = () => {
+		const resolution = readDefaultModeInfo();
+		if (resolution.issue) warnOnce(`default:${resolution.issue.kind}`, `${resolution.issue.detail}; using ${resolution.mode}`);
+		defaultMode = resolution.mode;
+		return defaultMode;
+	};
+	const readDefault = () => defaultMode ?? refreshDefault();
 	const setDefault = (mode) => {
 		defaultMode = mode;
 	};
 	const store = new ModeStore();
-	const matcher = compileSubagentMatcher(process.env.PONYTAIL_SUBAGENT_MATCHER);
+	const matcherResult = compileSubagentMatcher(process.env.PONYTAIL_SUBAGENT_MATCHER);
+	const matcher = matcherResult.matcher;
+	if (matcherResult.invalid) warnOnce("matcher:invalid", "PONYTAIL_SUBAGENT_MATCHER is not a valid regular expression; ignoring it (fail-open).");
 	const configFile = configPath();
 	const onConfigChange = () => {
-		defaultMode = readDefaultMode();
+		const resolution = readDefaultModeInfo();
+		if (resolution.issue) {
+			warnOnce(`config:${resolution.issue.kind}`, `${resolution.issue.detail}; keeping the previous default`);
+			return;
+		}
+		defaultMode = resolution.mode;
 	};
 	watchFile(configFile, { interval: 1e3 }, onConfigChange).unref();
-	ctx.effect(() => () => unwatchFile(configFile, onConfigChange), "ponytail: config hot reload");
+	ctx.effect(() => () => {
+		unwatchFile(configFile, onConfigChange);
+	}, "ponytail: config hot reload");
+	ctx.on("agent/disposed", ({ agent }) => {
+		store.clear(sessionKey(agent));
+	});
 	ctx.systemPrompt.section({
 		name: "ponytail",
 		order: SECTION_ORDER,
@@ -2484,7 +2636,7 @@ function apply(ctx) {
 				const preset = agent.session.header.agentPreset;
 				if (preset && !matcher.test(preset)) return "";
 			}
-			return getPonytailInstructions(agent ? store.modeFor(String(agent.id), readDefault()) : readDefault());
+			return getPonytailInstructions(agent ? store.modeFor(sessionKey(agent), readDefault()) : readDefault());
 		}
 	});
 	for (const skill of ponytailSkills()) ctx.skills.register(skill);
@@ -2498,7 +2650,7 @@ function apply(ctx) {
 	});
 	ctx.on("agent/pre-step", async (payload, next) => {
 		const deactivated = containsDeactivation(payload.messages);
-		if (deactivated) store.set(String(payload.agent.id), "off");
+		if (deactivated) store.set(sessionKey(payload.agent), "off");
 		const decision = await next();
 		if (deactivated && decision.kind === "enter") return {
 			kind: "enter",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mengyuly/dsh-ponytail",
   "description": "Lazy senior dev mode for DeepSeek Harness: always-on minimal-code ruleset, intensity switching, and short review/audit/debt/gain/help skills",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "publishConfig": {
     "access": "public"
   },