@duckmind/dm-darwin-x64 0.66.5 → 0.66.7

package/extensions/dm-ponytail/hooks/ponytail-instructions.js

@@ -1,4 +1,4 @@
-var __dirname = "/Users/que/Projects/dm-release-495/source/dm-mono/packages/coding-agent/dist/extensions/dm-ponytail/hooks";
+var __dirname = "/Users/que/Projects/dm/dm-mono/packages/coding-agent/dist/extensions/dm-ponytail/hooks";
 const fs = require("fs");
 const path = require("path");
 const { DEFAULT_MODE, normalizeMode, normalizePersistedMode } = require("./ponytail-config");
@@ -27,38 +27,34 @@ function filterSkillBodyForMode(body, mode) {
 function getFallbackInstructions(mode) {
   return "PONYTAIL MODE ACTIVE — level: " + mode + `
 
-` + `You are a lazy senior developer. Lazy means efficient, not careless. The best code is the code never written.
-
-` + `## Persistence
-
-` + `ACTIVE EVERY RESPONSE. No drift back to over-building. Still active if unsure. Off only: "stop ponytail" / "normal mode".
-
-` + "Current level: **" + mode + "**. Switch: `/ponytail lite|full|ultra`.\n\n" + `## The ladder
-
-` + `Before any code, stop at the first rung that holds (the ladder runs after you understand the problem, not instead of it — read the code it touches and trace the real flow first):
-` + `1. Does this need to be built at all? (YAGNI)
-` + `2. Does it already exist in this codebase? Reuse what is already here, do not re-write it.
-` + `3. Does the standard library do this? Use it.
-` + `4. Does a native platform feature cover it? Use it.
-` + `5. Does an already-installed dependency solve it? Use it.
-` + `6. Can this be one line? Make it one line.
-` + `7. Only then: write the minimum code that works.
-
-` + `Bug fix = root cause, not symptom: grep every caller of the function you touch and fix the shared function once (a smaller diff than one guard per caller); patching only the path the ticket names leaves a sibling caller broken.
-
-` + `## Rules
-
-` + "No abstractions that were not requested. No avoidable dependencies. No boilerplate nobody asked for. " + "Deletion over addition. Boring over clever. Fewest files possible. " + "Ship the lazy version and question the complex request in the same response — never stall. " + "Between two same-size stdlib options, pick the one correct on edge cases. " + "Mark deliberate simplifications that cut a real corner with a known ceiling, using a `ponytail:` comment that names the ceiling and upgrade path.\n\n" + `## Output
-
-` + "Code first. Then at most three short lines: what was skipped, when to add it. " + "If the explanation is longer than the code, delete the explanation. " + `Explanation the user explicitly asked for is not debt, give it in full.
-
-` + `## When NOT to be lazy
-
-` + "Never simplify away: understanding the problem (read it fully and trace the real flow before picking a rung — a small diff you do not understand is just laziness dressed up as efficiency), input validation at trust boundaries, error handling that prevents data loss, " + "security measures, accessibility basics, the calibration real hardware needs (the platform is never the spec ideal), anything the user explicitly asked to keep. " + `Lazy code without its check is unfinished: non-trivial logic leaves ONE runnable check behind (assert-based demo/self-check or one small test file; no frameworks). Trivial one-liners need no test.
-
-` + `## Boundaries
-
-` + 'Ponytail governs what you build, not how you talk. "stop ponytail" or "normal mode": revert. Level persists until changed or session end.';
+` + 'Switch level: `/ponytail lite|full|ultra`. Off: "stop ponytail" or "normal mode".\n\n' + `You are a lazy senior developer. The best code is the code never written. You solve the whole problem with the least new code. End your reply with one or two lines: what you skipped or did not check, and any risk the user must know.
+` + `
+` + `## Before you write
+` + `
+` + `Read the task and the code it touches. List every place your change must reach: callers, tests, fixtures, config, exports. Check what your change could break for users: data it would destroy or expose, callers that stop working. That is scope. Extra features are not.
+` + `
+` + `## The smallest complete change
+` + `
+` + `Take the first option that fully works:
+` + `
+` + `1. Does it need to exist? Skip features, options and flexibility nobody asked for, and name them in one line. A vague request ("build me X") gets the smallest version that does the core job.
+` + `2. Already in this codebase (a helper, component, service, pattern)? Use it the way the surrounding code does.
+` + `3. Standard library or a platform feature? Use it, unless the project has its own. A house component beats a native widget.
+` + `4. An installed dependency? Use it. Never add a dependency for a few lines.
+` + `5. Can it be one line a reader gets at a glance? One line.
+` + `6. Otherwise: the minimum code that works.
+` + `
+` + `- Be lazy about the solution, never about the change itself: finish every part the task needs, including the callers, tests and fixtures your change breaks.
+` + `- No abstraction, wrapper, type conversion, option, config, boilerplate or "for later" code nobody asked for. Keep values in the form the platform already gives you. Deletion beats addition. Keep the structure the codebase already has: its layers, interfaces and conventions.
+` + `- The shortest working diff wins, once you know everything it must touch. A one-liner that needs decoding is not short.
+` + `- Comment only the why the code cannot show, in one line.
+` + `- Bug fix: before you edit, grep every caller of the function you touch, then fix the root cause once in the shared code.
+` + `- Code you move or merge keeps its error handling and validation.
+` + `- Between options of equal size, take the one that is correct on edge cases.
+` + `- Lazy code without its check is unfinished: new non-trivial logic (a branch, a loop, a parser, money or security, or a whole new script or app) leaves one small test or an assert-based self-check. Trivial changes need none.
+` + "- A shortcut with a known limit gets a code comment in this form: `shortcut: <the limit>, <when to upgrade>`.\n" + `
+` + `Never cut: validation at trust boundaries, error handling that prevents data loss, security, accessibility, the calibration real hardware needs, anything the user asked for.
+`;
 }
 function getPonytailInstructions(mode) {
   const configuredMode = normalizePersistedMode(mode) || DEFAULT_MODE;

package/extensions/dm-ponytail/hooks/ponytail-map.js

@@ -0,0 +1,116 @@
+const fs = require("fs");
+const path = require("path");
+const { execFileSync } = require("child_process");
+const BUDGET = Number(process.env.PONYTAIL_MAP_CHARS || 2000);
+const MAX_FILES = 4000;
+const SRC = /\.(py|js|jsx|mjs|cjs|ts|tsx|go|rs|rb|java|kt|php|swift|cs)$/;
+const SKIP_DIR = /(^|\/)(node_modules|\.git|dist|build|out|vendor|venv|\.venv|__pycache__|coverage|\.next|target|migrations|versions|fixtures|tests?|__tests__|spec)(\/|$)/;
+const SKIP_FILE = /(^|\/)(test_[^/]*|[^/]*(_test|\.test|\.spec|\.gen|\.min|\.d)\.[a-z]+)$/;
+const SHARED = /(util|helper|lib|common|shared|service|component|hook|core|model|schema|api)/i;
+const PATTERNS = {
+  py: [/^(?:async\s+)?def\s+([A-Za-z]\w*)/gm, /^class\s+([A-Za-z]\w*)/gm],
+  js: [
+    /^export\s+(?:default\s+)?(?:async\s+)?(?:function\*?|class|const|let|var|interface|type|enum)\s+([A-Za-z_$][\w$]*)/gm,
+    /^export\s*\{([^}]*)\}/gm
+  ],
+  go: [/^func\s+(?:\([^)]*\)\s*)?([A-Z]\w*)/gm, /^type\s+([A-Z]\w*)/gm],
+  rs: [/^pub\s+(?:async\s+)?(?:fn|struct|enum|trait|type)\s+(\w+)/gm],
+  rb: [/^\s*(?:def|class|module)\s+([A-Za-z][\w.]*)/gm],
+  jvm: [/^\s*(?:public\s+)?(?:static\s+)?(?:final\s+)?(?:class|interface|enum|record)\s+(\w+)/gm]
+};
+const LANG = {
+  py: "py",
+  js: "js",
+  jsx: "js",
+  mjs: "js",
+  cjs: "js",
+  ts: "js",
+  tsx: "js",
+  go: "go",
+  rs: "rs",
+  rb: "rb",
+  java: "jvm",
+  kt: "jvm",
+  swift: "jvm",
+  cs: "jvm",
+  php: "jvm"
+};
+function listFiles(root) {
+  try {
+    const tracked = execFileSync("git", ["ls-files"], { cwd: root, encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 3000 }).split(`
+`).filter(Boolean).slice(0, MAX_FILES * 5);
+    if (tracked.length)
+      return tracked;
+  } catch (e) {}
+  {
+    const out = [];
+    (function walk(dir, depth) {
+      if (depth > 6 || out.length > MAX_FILES * 5)
+        return;
+      for (const ent of fs.readdirSync(dir, { withFileTypes: true })) {
+        if (ent.name.startsWith("."))
+          continue;
+        const rel = path.relative(root, path.join(dir, ent.name)).replace(/\\/g, "/");
+        if (ent.isDirectory()) {
+          if (!SKIP_DIR.test(rel + "/"))
+            walk(path.join(dir, ent.name), depth + 1);
+        } else
+          out.push(rel);
+      }
+    })(root, 0);
+    return out;
+  }
+}
+function namesIn(file, text) {
+  const lang = LANG[path.extname(file).slice(1)];
+  const names = [];
+  for (const re of PATTERNS[lang] || []) {
+    for (const m of text.matchAll(re)) {
+      for (const n of m[1].split(",").map((s) => s.trim().split(/\s+as\s+/).pop()).filter(Boolean)) {
+        if (!n.startsWith("_") && !names.includes(n))
+          names.push(n);
+      }
+    }
+  }
+  return names;
+}
+function buildMap(root = process.cwd()) {
+  const files = listFiles(root).filter((f) => SRC.test(f) && !SKIP_DIR.test(f) && !SKIP_FILE.test(f)).slice(0, MAX_FILES).sort((a, b) => SHARED.test(b) - SHARED.test(a) || a.localeCompare(b));
+  const dirs = new Map;
+  for (const f of files) {
+    let text;
+    try {
+      text = fs.readFileSync(path.join(root, f), "utf8").slice(0, 65536);
+    } catch (e) {
+      continue;
+    }
+    const names = namesIn(f, text);
+    if (!names.length)
+      continue;
+    const dir = path.dirname(f) === "." ? "." : path.dirname(f);
+    dirs.set(dir, [...dirs.get(dir) || [], names]);
+  }
+  const lines = [];
+  let used = 0;
+  let skipped = 0;
+  for (const [dir, perFile] of dirs) {
+    const names = [...new Set(perFile.flatMap((n) => n.slice(0, perFile.length > 8 ? 1 : 3)))];
+    const line = `${dir}/: ${names.slice(0, 30).join(", ")}${names.length > 30 ? ", ..." : ""}`;
+    if (used + line.length > BUDGET) {
+      skipped++;
+      continue;
+    }
+    lines.push(line);
+    used += line.length + 1;
+  }
+  if (!lines.length)
+    return "";
+  return `Codebase map (what already exists; reuse it, read a file only when you need its details):
+` + lines.join(`
+`) + (skipped ? `
+(${skipped} more folders not listed)` : "");
+}
+module.exports = { buildMap };
+if (import.meta.main)
+  process.stdout.write(buildMap(process.argv[2] || process.cwd()) + `
+`);

package/extensions/dm-ponytail/hooks/ponytail-mode-tracker.js

@@ -3,6 +3,7 @@ const {
   clearMode,
   cursorRuleNotice,
   cursorRulePath,
+  isCodex,
   isCursor,
   isQoder,
   readMode,
@@ -34,9 +35,7 @@ function finish() {
       const arg = parts[1] || "";
       let mode = null;
       let isReportOnly = false;
-      if (cmd === "/ponytail-review" || cmd === "/ponytail:ponytail-review") {
-        mode = "review";
-      } else if (cmd === "/ponytail" || cmd === "/ponytail:ponytail") {
+      if (cmd === "/ponytail" || cmd === "/ponytail:ponytail") {
         if (arg === "default") {
           const dmode = parts[2];
           if (dmode === "off" || dmode === "lite" || dmode === "full" || dmode === "ultra") {
@@ -54,31 +53,42 @@ function finish() {
         else if (arg === "off")
           mode = "off";
         else if (arg === "") {
-          isReportOnly = true;
-          mode = readMode() || getDefaultMode();
-        } else {
-          mode = getDefaultMode();
+          const live = readMode();
+          if (live && live !== "off") {
+            isReportOnly = true;
+            mode = live;
+          } else {
+            mode = getDefaultMode() === "off" ? "full" : getDefaultMode();
+          }
         }
       }
       if (isReportOnly) {
-        writeHookOutput("UserPromptSubmit", mode, "PONYTAIL MODE ACTIVE — level: " + mode);
+        if (!isQoder) {
+          writeHookOutput("UserPromptSubmit", mode, "PONYTAIL MODE ACTIVE — level: " + mode);
+        }
       } else if (mode && mode !== "off") {
         setMode(mode);
         modeSwitched = true;
         if (!isQoder) {
           const header = "PONYTAIL MODE CHANGED — level: " + mode;
-          writeHookOutput("UserPromptSubmit", mode, isCursor ? header + `
+          writeHookOutput("UserPromptSubmit", mode, isCodex || isCursor ? header + `
 
 ` + getPonytailInstructions(mode) : header);
         }
       } else if (mode === "off") {
-        clearMode();
+        if (isQoder)
+          setMode("off");
+        else
+          clearMode();
         deactivated = true;
         writeHookOutput("UserPromptSubmit", "off", "PONYTAIL MODE OFF");
       }
     }
     if (!modeSwitched && !deactivated && isDeactivationCommand(prompt)) {
-      clearMode();
+      if (isQoder)
+        setMode("off");
+      else
+        clearMode();
       deactivated = true;
       writeHookOutput("UserPromptSubmit", "off", "PONYTAIL MODE OFF");
     }
@@ -104,7 +114,10 @@ function finish() {
 process.stdin.on("data", (chunk) => {
   input += chunk;
 });
-process.stdin.on("end", finish);
+process.stdin.on("end", () => {
+  finish();
+  process.exit(0);
+});
 process.stdin.on("error", () => {
   finish();
   process.exit(0);
@@ -112,4 +125,4 @@ process.stdin.on("error", () => {
 setTimeout(() => {
   finish();
   process.exit(0);
-}, 1000).unref();
+}, 1000);

package/extensions/dm-ponytail/hooks/ponytail-runtime.js

@@ -1,6 +1,7 @@
 const fs = require("fs");
 const path = require("path");
 const os = require("os");
+const { createHash } = require("crypto");
 const { getClaudeDir, getConfigDir } = require("./ponytail-config");
 const STATE_FILE = ".ponytail-active";
 function isVsCodeCopilotRoot(pluginRoot) {
@@ -11,7 +12,8 @@ function isVsCodeCopilotRoot(pluginRoot) {
 const isCopilot = Boolean(process.env.COPILOT_PLUGIN_DATA) || isVsCodeCopilotRoot(process.env.CLAUDE_PLUGIN_ROOT);
 const isCodex = !isCopilot && Boolean(process.env.PLUGIN_DATA);
 const isQoder = !isCopilot && !isCodex && Boolean(process.env.QODER_SESSION_ID);
-const isCursor = !isCopilot && !isCodex && !isQoder && Boolean(process.env.CURSOR_VERSION);
+const isCodeBuddy = !isCopilot && !isCodex && !isQoder && Boolean(process.env.CODEBUDDY_PLUGIN_ROOT);
+const isCursor = !isCopilot && !isCodex && !isQoder && !isCodeBuddy && Boolean(process.env.CURSOR_VERSION);
 let stateDir = getClaudeDir();
 if (isCodex)
   stateDir = process.env.PLUGIN_DATA;
@@ -19,21 +21,32 @@ if (isCopilot)
   stateDir = process.env.COPILOT_PLUGIN_DATA || getClaudeDir();
 if (isQoder)
   stateDir = path.join(os.homedir(), ".qoder");
+if (isCodeBuddy)
+  stateDir = process.env.CODEBUDDY_CONFIG_DIR || path.join(os.homedir(), ".codebuddy");
 if (isCursor)
   stateDir = path.join(os.homedir(), ".cursor");
 const statePath = path.join(stateDir, STATE_FILE);
+const projectDir = (process.env.CLAUDE_PROJECT_DIR || "").trim();
+const projectStatePath = projectDir ? path.join(stateDir, "ponytail-modes", createHash("sha256").update(path.normalize(projectDir)).digest("hex")) : null;
 function setMode(mode) {
-  fs.mkdirSync(path.dirname(statePath), { recursive: true });
-  fs.writeFileSync(statePath, mode);
+  for (const file of [projectStatePath, statePath]) {
+    if (!file)
+      continue;
+    fs.mkdirSync(path.dirname(file), { recursive: true });
+    fs.writeFileSync(file, mode);
+  }
 }
 function clearMode() {
-  try {
-    fs.unlinkSync(statePath);
-  } catch (e) {}
+  for (const file of [projectStatePath, statePath]) {
+    if (file)
+      try {
+        fs.unlinkSync(file);
+      } catch (e) {}
+  }
 }
 function readMode() {
   try {
-    return fs.readFileSync(statePath, "utf8").trim() || null;
+    return fs.readFileSync(projectStatePath || statePath, "utf8").trim() || null;
   } catch (e) {
     return null;
   }
@@ -52,7 +65,7 @@ function writeHookOutput(event, mode, context = "") {
     return;
   }
   if (isCodex) {
-    const output = { systemMessage: `PONYTAIL:${mode.toUpperCase()}` };
+    const output = {};
     if (context) {
       output.hookSpecificOutput = {
         hookEventName: event,
@@ -62,7 +75,7 @@ function writeHookOutput(event, mode, context = "") {
     process.stdout.write(JSON.stringify(output));
     return;
   }
-  if (isQoder) {
+  if (isQoder || isCodeBuddy) {
     const output = {};
     if (context) {
       output.hookSpecificOutput = {
@@ -92,6 +105,7 @@ module.exports = {
   clearMode,
   cursorRuleNotice,
   cursorRulePath,
+  isCodeBuddy,
   isCodex,
   isCopilot,
   isCursor,

package/extensions/dm-ponytail/hooks/ponytail-subagent.js

@@ -1,5 +1,6 @@
 const { getPonytailInstructions } = require("./ponytail-instructions");
 const { readMode, writeHookOutput } = require("./ponytail-runtime");
+const vm = require("vm");
 const mode = readMode();
 if (!mode || mode === "off") {
   process.exit(0);
@@ -31,7 +32,15 @@ function finish() {
   try {
     agentType = String(JSON.parse(input.replace(/^\uFEFF/, "")).agent_type || "").trim();
   } catch (e) {}
-  if (agentType && !matcherRe.test(agentType)) {
+  let matches = true;
+  try {
+    if (agentType) {
+      matches = vm.runInNewContext("re.test(s)", { re: matcherRe, s: agentType }, { timeout: 100 });
+    }
+  } catch (e) {
+    matches = true;
+  }
+  if (!matches) {
     process.exit(0);
   }
   inject();
@@ -39,7 +48,10 @@ function finish() {
 process.stdin.on("data", (chunk) => {
   input += chunk;
 });
-process.stdin.on("end", finish);
+process.stdin.on("end", () => {
+  finish();
+  process.exit(0);
+});
 process.stdin.on("error", () => {
   finish();
   process.exit(0);
@@ -47,4 +59,4 @@ process.stdin.on("error", () => {
 setTimeout(() => {
   finish();
   process.exit(0);
-}, 1000).unref();
+}, 1000);

package/extensions/dm-ponytail/hooks/qoder-hooks.json

@@ -1,12 +1,12 @@
 {
-  "_comment": "Reference template — copy the 'hooks' object into your .qoder/settings.json or ~/.qoder/settings.json. Replace PONYTAIL_DIR with the path to your ponytail checkout (e.g. ~/.qoder/plugins/ponytail or the npm global install path).",
+  "_comment": "Loaded live by .qoder-plugin/plugin.json (\"hooks\": \"./hooks/qoder-hooks.json\"). Qoder expands ${QODER_PLUGIN_ROOT} (the plugin install root) at runtime; see https://docs.qoder.com/en/cli/plugins#writing-plugin-hooks.",
   "hooks": {
     "UserPromptSubmit": [
       {
         "hooks": [
           {
             "type": "command",
-            "command": "node PONYTAIL_DIR/hooks/ponytail-mode-tracker.js"
+            "command": "node \"${QODER_PLUGIN_ROOT}/hooks/ponytail-mode-tracker.js\""
           }
         ]
       }
@@ -17,7 +17,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node PONYTAIL_DIR/hooks/ponytail-subagent.js"
+            "command": "node \"${QODER_PLUGIN_ROOT}/hooks/ponytail-subagent.js\""
           }
         ]
       }

package/extensions/dm-ponytail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dm-ponytail",
-  "version": "4.10.0",
+  "version": "5.1.0",
   "description": "DM extension that applies Ponytail's full minimal-code mode by default",
   "type": "commonjs",
   "keywords": [

package/extensions/dm-ponytail/pi-extension/index.js

@@ -32,10 +32,12 @@ export function resolveSessionMode(entries, fallbackMode = DEFAULT_MODE) {
   }
   return fallback;
 }
-export function parsePonytailCommand(text, defaultMode = DEFAULT_MODE) {
+export function parsePonytailCommand(text, defaultMode = DEFAULT_MODE, currentMode = null) {
   const fallback = normalizePersistedMode(defaultMode) || DEFAULT_MODE;
   const normalizedText = String(text || "").trim().toLowerCase();
   if (!normalizedText) {
+    if (currentMode && currentMode !== "off")
+      return { type: "status" };
     return { type: "set-mode", mode: fallback === "off" ? "full" : fallback };
   }
   const [primary, secondary] = normalizedText.split(/\s+/);
@@ -73,7 +75,7 @@ export default function ponytailExtension(pi) {
       return;
     }
     if (currentMode === "off") {
-      c.ui.setStatus("ponytail", "");
+      c.ui.setStatus("ponytail", undefined);
       return;
     }
     const levelIcons = { lite: "\uD83C\uDF3F", full: "⚡", ultra: "\uD83D\uDD25" };
@@ -95,16 +97,16 @@ export default function ponytailExtension(pi) {
     const normalized = String(args || "").trim();
     const message = normalized ? `${skillName} ${normalized}` : skillName;
     if (ctx?.isIdle?.() === false) {
-      pi.sendUserMessage(message, { deliverAs: "followUp" });
+      pi.sendUserMessage(message, { expandPromptTemplates: true, deliverAs: "followUp" });
       ctx?.ui?.notify?.(`${skillName} queued as follow-up.`, "info");
       return;
     }
-    pi.sendUserMessage(message);
+    pi.sendUserMessage(message, { expandPromptTemplates: true });
   };
   pi.registerCommand("ponytail", {
     description: PONYTAIL_COMMAND_DESCRIPTION,
     handler: async (args, ctx) => {
-      const parsed = parsePonytailCommand(args, configuredDefaultMode);
+      const parsed = parsePonytailCommand(args, configuredDefaultMode, currentMode);
       if (parsed.type === "status") {
         ctx?.ui?.notify?.(`Ponytail: current ${currentMode} • default ${configuredDefaultMode}`, "info");
         return;
@@ -131,42 +133,48 @@ export default function ponytailExtension(pi) {
   });
   pi.registerCommand("ponytail-review", {
     description: "Run /skill:ponytail-review",
-    handler: (_args, ctx) => sendAlias("/skill:ponytail-review", "", ctx)
+    handler: (args, ctx) => sendAlias("/skill:ponytail-review", args, ctx)
   });
   pi.registerCommand("ponytail-audit", {
     description: "Run /skill:ponytail-audit",
-    handler: (_args, ctx) => sendAlias("/skill:ponytail-audit", "", ctx)
+    handler: (args, ctx) => sendAlias("/skill:ponytail-audit", args, ctx)
   });
   pi.registerCommand("ponytail-gain", {
     description: "Run /skill:ponytail-gain",
-    handler: (_args, ctx) => sendAlias("/skill:ponytail-gain", "", ctx)
+    handler: (args, ctx) => sendAlias("/skill:ponytail-gain", args, ctx)
   });
   pi.registerCommand("ponytail-debt", {
     description: "Run /skill:ponytail-debt",
-    handler: (_args, ctx) => sendAlias("/skill:ponytail-debt", "", ctx)
+    handler: (args, ctx) => sendAlias("/skill:ponytail-debt", args, ctx)
   });
   pi.registerCommand("ponytail-help", {
     description: "Run /skill:ponytail-help",
-    handler: (_args, ctx) => sendAlias("/skill:ponytail-help", "", ctx)
+    handler: (args, ctx) => sendAlias("/skill:ponytail-help", args, ctx)
   });
-  pi.on("input", async (event) => {
+  pi.on("input", async (event, ctx) => {
     if (event?.source === "extension")
       return;
     const text = String(event?.text || "");
     if (currentMode !== "off" && isDeactivationCommand(text)) {
-      setMode("off");
+      setMode("off", ctx);
     }
   });
-  pi.on("session_start", async (_event, ctx) => {
+  const restoreSessionMode = (ctx) => {
     const entries = ctx?.sessionManager?.getBranch?.() || ctx?.sessionManager?.getEntries?.() || [];
-    configuredDefaultMode = getDefaultMode();
-    hideStatus = getHideStatus();
     currentMode = resolveSessionMode(entries, configuredDefaultMode);
     syncStatus(ctx);
+  };
+  pi.on("session_start", async (_event, ctx) => {
+    configuredDefaultMode = getDefaultMode();
+    hideStatus = getHideStatus();
+    restoreSessionMode(ctx);
     if (!getQuietStartup()) {
       ctx?.ui?.notify?.(`Ponytail loaded: ${currentMode}`, "info");
     }
   });
+  pi.on("session_tree", async (_event, ctx) => {
+    restoreSessionMode(ctx);
+  });
   pi.on("agent_start", async (_event, ctx) => {
     isActive = true;
     syncStatus(ctx);
@@ -176,11 +184,23 @@ export default function ponytailExtension(pi) {
     syncStatus(ctx);
   });
   pi.on("before_agent_start", async (event) => {
-    if (!currentMode || currentMode === "off")
+    if (!currentMode || currentMode === "off") {
+      if (event?.systemPromptOptions?.sections)
+        delete event.systemPromptOptions.sections.ponytail;
+      return;
+    }
+    const instructions = getPonytailInstructions(currentMode);
+    const sections = event?.systemPromptOptions?.sections;
+    if (sections && typeof sections === "object") {
+      sections.ponytail = instructions;
       return;
+    }
+    if (Array.isArray(event?.systemPrompt)) {
+      return { systemPrompt: [...event.systemPrompt, instructions] };
+    }
     const base = event?.systemPrompt ? `${event.systemPrompt}
 
 ` : "";
-    return { systemPrompt: `${base}${getPonytailInstructions(currentMode)}` };
+    return { systemPrompt: `${base}${instructions}` };
   });
 }

package/extensions/dm-ponytail/pi-extension/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "ponytail-pi-extension-dev",
+  "name": "ponytail-dm-extension-dev",
   "private": true,
   "type": "module",
   "scripts": {

package/extensions/dm-ponytail/skills/plugin.json

@@ -0,0 +1,5 @@
+{
+  "name": "ponytail",
+  "description": "Lazy senior dev mode. Forces the simplest solution that works: YAGNI, stdlib first, one line over fifty.",
+  "skills": "."
+}