@delt/claude-jev-advisor 0.1.1 → 0.2.0

package/dist/statusline.js

@@ -4,21 +4,24 @@
 import os from "os";
 
 // src/display/statusline-run.ts
-import { spawnSync } from "child_process";
+import { spawn, spawnSync } from "child_process";
 import fs3 from "fs";
+import path4 from "path";
 
 // src/config.ts
 import fs from "fs";
 import path2 from "path";
 
 // src/config-shape.ts
+var CONFIG_VERSION = 2;
 var DEFAULT_CONFIG = {
   lang: "ko",
   keyFile: null,
   display: "mod",
-  context: { enabled: true, minTokens: 1e5, compactMinTokens: 2e5, redRemainingPct: 20, unitDoneYes: 0.7, goalDoneYes: 0.8 },
+  context: { enabled: true, minTokens: 25e4, compactMinTokens: 25e4, redRemainingPct: 20, unitDoneYes: 0.6, phaseDoneYes: 0.6 },
   rm: { enabled: true, jev: true, throwawayYes: 0.8, maxDirFiles: 50 }
 };
+var LEGACY_CONTEXT_DEFAULTS = { minTokens: 1e5, compactMinTokens: 2e5, unitDoneYes: 0.7 };
 var LANGS = ["ko", "en"];
 var DISPLAYS = ["mod", "statusline", "message"];
 function isRecord(value) {
@@ -32,13 +35,17 @@ function mergeSection(defaults, raw) {
   }
   return out;
 }
+function withoutLegacyDefaults(context) {
+  if (!isRecord(context)) return context;
+  return Object.fromEntries(Object.entries(context).filter(([key, value]) => LEGACY_CONTEXT_DEFAULTS[key] !== value));
+}
 function normalizeConfig(raw) {
   const r = isRecord(raw) ? raw : {};
   return {
     lang: typeof r.lang === "string" && LANGS.includes(r.lang) ? r.lang : DEFAULT_CONFIG.lang,
     keyFile: typeof r.keyFile === "string" && r.keyFile !== "" ? r.keyFile : null,
     display: typeof r.display === "string" && DISPLAYS.includes(r.display) ? r.display : DEFAULT_CONFIG.display,
-    context: mergeSection(DEFAULT_CONFIG.context, r.context),
+    context: mergeSection(DEFAULT_CONFIG.context, r.version === CONFIG_VERSION ? r.context : withoutLegacyDefaults(r.context)),
     rm: mergeSection(DEFAULT_CONFIG.rm, r.rm)
   };
 }
@@ -87,6 +94,11 @@ function formatSize(tokens) {
 function remainingPct(size, threshold) {
   return Math.max(0, Math.round((threshold - size) / threshold * 100));
 }
+function adviceKind(size, judgment, config) {
+  if (size === null || size < config.context.minTokens || !judgment || judgment.phase === "working") return null;
+  if (judgment.clear) return "clear";
+  return size >= config.context.compactMinTokens ? "compact" : null;
+}
 function adviceLine({ size, threshold, judgment, config }) {
   if (size === null) return "";
   const k = formatSize(size);
@@ -99,10 +111,8 @@ function adviceLine({ size, threshold, judgment, config }) {
     return `${head} \xB7 ${counted.clear ? phrases.clear : phrases.compact}`;
   }
   if (!counted) return k;
-  if (counted.phase === "working") return `\u{1F7E2} ${k}`;
-  if (counted.clear) return `\u{1F7E1} ${k} ${phrases.clear}`;
-  if (size >= config.context.compactMinTokens) return `\u{1F7E1} ${k} ${phrases.compact}`;
-  return `\u{1F7E2} ${k}`;
+  const kind = adviceKind(size, counted, config);
+  return kind ? `\u{1F7E1} ${k} ${phrases[kind]}` : `\u{1F7E2} ${k}`;
 }
 function usableJudgment(state, liveSize, turnStartedAt) {
   if (!state || !state.judgment || state.at < turnStartedAt) return null;
@@ -133,9 +143,39 @@ function readState(home, sessionId) {
 
 // src/display/statusline-run.ts
 var BEFORE_TIMEOUT_MS = 2e3;
+var DEFAULT_GIT_BASH = "C:\\Program Files\\Git\\bin\\bash.exe";
 function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function findGitBash(env, exists) {
+  const given = env.CLAUDE_CODE_GIT_BASH_PATH;
+  if (given && exists(given)) return given;
+  const candidates = [];
+  for (const dir of (env.PATH ?? env.Path ?? "").split(";").filter(Boolean)) {
+    if (!exists(path4.win32.join(dir, "git.exe"))) continue;
+    const parent = path4.win32.dirname(dir);
+    const root = path4.win32.basename(parent).toLowerCase() === "mingw64" ? path4.win32.dirname(parent) : parent;
+    candidates.push(path4.win32.join(root, "bin", "bash.exe"));
+  }
+  candidates.push(DEFAULT_GIT_BASH);
+  return candidates.find(exists) ?? null;
+}
+function statusLineShell(platform, env, exists) {
+  if (platform !== "win32") return { file: "/bin/sh", args: ["-c"] };
+  const bash = findGitBash(env, exists);
+  return bash ? { file: bash, args: ["-c"] } : { file: "powershell.exe", args: ["-NoProfile", "-NonInteractive", "-Command"] };
+}
+function killTree(pid) {
+  if (pid === void 0) return;
+  if (process.platform === "win32") {
+    spawnSync("taskkill", ["/pid", String(pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
+    return;
+  }
+  try {
+    process.kill(-pid, "SIGKILL");
+  } catch {
+  }
+}
 function previousStatusLine(home) {
   try {
     const value = JSON.parse(fs3.readFileSync(statusLineBeforePath(home), "utf8"));
@@ -144,9 +184,39 @@ function previousStatusLine(home) {
     return null;
   }
 }
-function runBeforeCommand(command, input) {
-  const r = spawnSync(command, { shell: true, input, encoding: "utf8", timeout: BEFORE_TIMEOUT_MS, windowsHide: true });
-  return r.status === 0 && typeof r.stdout === "string" ? r.stdout : "";
+function runBeforeCommand(command, input, shell = statusLineShell(process.platform, process.env, fs3.existsSync), timeoutMs = BEFORE_TIMEOUT_MS) {
+  return new Promise((resolve) => {
+    let child;
+    try {
+      child = spawn(shell.file, [...shell.args, command], { stdio: ["pipe", "pipe", "ignore"], windowsHide: true, detached: process.platform !== "win32" });
+    } catch {
+      resolve("");
+      return;
+    }
+    let out = "";
+    let settled = false;
+    const settle = (text) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      resolve(text);
+    };
+    const timer = setTimeout(() => {
+      killTree(child.pid);
+      child.stdout?.destroy();
+      child.unref();
+      settle("");
+    }, timeoutMs);
+    child.stdout?.setEncoding("utf8");
+    child.stdout?.on("data", (chunk) => {
+      out += chunk;
+    });
+    child.on("error", () => settle(""));
+    child.on("close", (code) => settle(code === 0 ? out : ""));
+    child.stdin?.on("error", () => {
+    });
+    child.stdin?.end(input);
+  });
 }
 function ourLine(raw, home) {
   let input;
@@ -162,10 +232,10 @@ function ourLine(raw, home) {
   const judgment = usableJudgment(readState(home, input.session_id), size, 0);
   return adviceLine({ size, threshold: null, judgment, config });
 }
-function runStatusLine(raw, deps) {
+async function runStatusLine(raw, deps) {
   const before = previousStatusLine(deps.home);
-  const parts = [before ? deps.runBefore(before.command, raw).replace(/\s+$/, "") : "", ourLine(raw, deps.home)];
-  return parts.filter(Boolean).join(" ");
+  const userLine = before ? (await deps.runBefore(before.command, raw)).replace(/\s+$/, "") : "";
+  return [userLine, ourLine(raw, deps.home)].filter(Boolean).join(" ");
 }
 
 // src/display/statusline.ts
@@ -173,7 +243,7 @@ async function main() {
   let raw = "";
   process.stdin.setEncoding("utf8");
   for await (const chunk of process.stdin) raw += chunk;
-  const out = runStatusLine(raw, { home: os.homedir(), runBefore: runBeforeCommand });
+  const out = await runStatusLine(raw, { home: os.homedir(), runBefore: (command, input) => runBeforeCommand(command, input) });
   if (out) process.stdout.write(out);
 }
 main().catch(() => {

package/mod/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "jev-advisor",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Bottom-row compact/clear advice from @delt/claude-jev-advisor (unofficial)",
   "author": { "name": "delt96" },
   "userConfig": {

package/mod/hooks/register.js

@@ -1,11 +1,13 @@
 // src/config-shape.ts
+var CONFIG_VERSION = 2;
 var DEFAULT_CONFIG = {
   lang: "ko",
   keyFile: null,
   display: "mod",
-  context: { enabled: true, minTokens: 1e5, compactMinTokens: 2e5, redRemainingPct: 20, unitDoneYes: 0.7, goalDoneYes: 0.8 },
+  context: { enabled: true, minTokens: 25e4, compactMinTokens: 25e4, redRemainingPct: 20, unitDoneYes: 0.6, phaseDoneYes: 0.6 },
   rm: { enabled: true, jev: true, throwawayYes: 0.8, maxDirFiles: 50 }
 };
+var LEGACY_CONTEXT_DEFAULTS = { minTokens: 1e5, compactMinTokens: 2e5, unitDoneYes: 0.7 };
 var LANGS = ["ko", "en"];
 var DISPLAYS = ["mod", "statusline", "message"];
 function isRecord(value) {
@@ -19,13 +21,17 @@ function mergeSection(defaults, raw) {
   }
   return out;
 }
+function withoutLegacyDefaults(context) {
+  if (!isRecord(context)) return context;
+  return Object.fromEntries(Object.entries(context).filter(([key, value]) => LEGACY_CONTEXT_DEFAULTS[key] !== value));
+}
 function normalizeConfig(raw) {
   const r = isRecord(raw) ? raw : {};
   return {
     lang: typeof r.lang === "string" && LANGS.includes(r.lang) ? r.lang : DEFAULT_CONFIG.lang,
     keyFile: typeof r.keyFile === "string" && r.keyFile !== "" ? r.keyFile : null,
     display: typeof r.display === "string" && DISPLAYS.includes(r.display) ? r.display : DEFAULT_CONFIG.display,
-    context: mergeSection(DEFAULT_CONFIG.context, r.context),
+    context: mergeSection(DEFAULT_CONFIG.context, r.version === CONFIG_VERSION ? r.context : withoutLegacyDefaults(r.context)),
     rm: mergeSection(DEFAULT_CONFIG.rm, r.rm)
   };
 }
@@ -53,6 +59,11 @@ function formatSize(tokens) {
 function remainingPct(size, threshold) {
   return Math.max(0, Math.round((threshold - size) / threshold * 100));
 }
+function adviceKind(size, judgment, config) {
+  if (size === null || size < config.context.minTokens || !judgment || judgment.phase === "working") return null;
+  if (judgment.clear) return "clear";
+  return size >= config.context.compactMinTokens ? "compact" : null;
+}
 function adviceLine({ size, threshold, judgment, config }) {
   if (size === null) return "";
   const k = formatSize(size);
@@ -65,10 +76,8 @@ function adviceLine({ size, threshold, judgment, config }) {
     return `${head} \xB7 ${counted.clear ? phrases.clear : phrases.compact}`;
   }
   if (!counted) return k;
-  if (counted.phase === "working") return `\u{1F7E2} ${k}`;
-  if (counted.clear) return `\u{1F7E1} ${k} ${phrases.clear}`;
-  if (size >= config.context.compactMinTokens) return `\u{1F7E1} ${k} ${phrases.compact}`;
-  return `\u{1F7E2} ${k}`;
+  const kind = adviceKind(size, counted, config);
+  return kind ? `\u{1F7E1} ${k} ${phrases[kind]}` : `\u{1F7E2} ${k}`;
 }
 function usableJudgment(state, liveSize2, turnStartedAt) {
   if (!state || !state.judgment || state.at < turnStartedAt) return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@delt/claude-jev-advisor",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Unofficial Claude Code helpers using TypeSafe Jev: compact/clear advice and an rm guard",
   "type": "module",
   "bin": {