@sonnechasser/ntrp 1.4.1 → 1.4.2

package/dist/index.js

@@ -9887,11 +9887,15 @@ function resolveCardWidth(opts = {}) {
   const usable = Math.max(20, termWidth() - margin);
   return Math.max(Math.min(min, usable), Math.min(usable, max));
 }
-var ANSI_RE;
+function clearTerminalHome() {
+  process.stdout.write(TERMINAL_HOME_CLEAR);
+}
+var ANSI_RE, TERMINAL_HOME_CLEAR;
 var init_layout = __esm({
   "src/ui/layout.ts"() {
     "use strict";
     ANSI_RE = /\u001b\[[0-9;]*m/g;
+    TERMINAL_HOME_CLEAR = "\x1B[2J\x1B[H";
   }
 });
 
@@ -22445,9 +22449,9 @@ async function handleGetSessionBrief(input) {
   if (!target) {
     return { error: `No session matching "${raw}".` };
   }
-  const { existsSync: existsSync34, readFileSync: readFileSync24 } = await import("fs");
+  const { existsSync: existsSync35, readFileSync: readFileSync24 } = await import("fs");
   const briefPath = contextDocPathForSession2(target.id);
-  if (!existsSync34(briefPath)) {
+  if (!existsSync35(briefPath)) {
     return {
       session_id: target.id,
       error: "No context brief on disk for this session (created before brief storage existed).",
@@ -34629,22 +34633,29 @@ var init_update_check = __esm({
 import { existsSync as existsSync30, readFileSync as readFileSync22 } from "fs";
 import { dirname as dirname6, join as join34 } from "path";
 import { fileURLToPath } from "url";
+function readVersionFromPackageJson(packageJsonPath) {
+  if (!existsSync30(packageJsonPath)) return null;
+  try {
+    const pkg = JSON.parse(readFileSync22(packageJsonPath, "utf-8"));
+    if (typeof pkg.version === "string" && pkg.version.length > 0) return pkg.version;
+  } catch {
+  }
+  return null;
+}
+function readVersionNearEntry(entryPath) {
+  const start = dirname6(entryPath);
+  for (const rel of [join34(start, "..", "package.json"), join34(start, "../..", "package.json")]) {
+    const version = readVersionFromPackageJson(rel);
+    if (version) return version;
+  }
+  return null;
+}
+function readInstalledVersionFromDisk() {
+  return readVersionNearEntry(fileURLToPath(import.meta.url));
+}
 function getInstalledVersion() {
   if (cachedVersion) return cachedVersion;
-  const start = dirname6(fileURLToPath(import.meta.url));
-  for (const rel of ["../package.json", "../../package.json"]) {
-    const path = join34(start, rel);
-    if (!existsSync30(path)) continue;
-    try {
-      const pkg = JSON.parse(readFileSync22(path, "utf-8"));
-      if (typeof pkg.version === "string" && pkg.version.length > 0) {
-        cachedVersion = pkg.version;
-        return cachedVersion;
-      }
-    } catch {
-    }
-  }
-  cachedVersion = "0.0.0";
+  cachedVersion = readInstalledVersionFromDisk() ?? "0.0.0";
   return cachedVersion;
 }
 var cachedVersion;
@@ -34756,9 +34767,16 @@ __export(relaunch_exports, {
   JUST_UPDATED_ENV: () => JUST_UPDATED_ENV,
   consumeJustUpdatedEnv: () => consumeJustUpdatedEnv,
   encodeJustUpdated: () => encodeJustUpdated,
+  reclaimStdinAfterFailedRelaunch: () => reclaimStdinAfterFailedRelaunch,
+  relaunchArgv: () => relaunchArgv,
   relaunchIntoHome: () => relaunchIntoHome,
+  releaseStdinForRelaunch: () => releaseStdinForRelaunch,
+  resolveRelaunchEntry: () => resolveRelaunchEntry,
   updateRestartSummary: () => updateRestartSummary
 });
+import { existsSync as existsSync31 } from "fs";
+import { join as join35 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 import { spawnSync } from "child_process";
 function encodeJustUpdated(fromVersion, toVersion) {
   return `${fromVersion}\u2192${toVersion}`;
@@ -34778,16 +34796,53 @@ function consumeJustUpdatedEnv() {
 function updateRestartSummary(toVersion) {
   return `Restart NTRP to use v${toVersion}`;
 }
+function npmGlobalEntry() {
+  const listed = spawnSync("npm", ["root", "-g"], { encoding: "utf-8" });
+  if (listed.status !== 0) return null;
+  const entry = join35(listed.stdout.trim(), NPM_PACKAGE, "dist/index.js");
+  return existsSync31(entry) ? entry : null;
+}
+function thisBundleEntry() {
+  return fileURLToPath2(import.meta.url);
+}
+function resolveRelaunchEntry(toVersion) {
+  const candidates = [thisBundleEntry(), npmGlobalEntry(), process.argv[1]].filter(
+    (p) => Boolean(p)
+  );
+  for (const entry of candidates) {
+    if (!existsSync31(entry)) continue;
+    if (readVersionNearEntry(entry) === toVersion) return entry;
+  }
+  return candidates.find((p) => existsSync31(p)) ?? thisBundleEntry();
+}
+function relaunchArgv(toVersion) {
+  return [resolveRelaunchEntry(toVersion)];
+}
+function releaseStdinForRelaunch(rl) {
+  try {
+    if (process.stdin.isTTY && process.stdin.isRaw === true) {
+      process.stdin.setRawMode(false);
+    }
+  } catch {
+  }
+  try {
+    rl?.pause();
+  } catch {
+  }
+}
+function reclaimStdinAfterFailedRelaunch(rl) {
+  try {
+    rl?.resume();
+  } catch {
+  }
+}
 async function relaunchIntoHome(opts) {
   const { stopSessionTranscript: stopSessionTranscript2 } = await Promise.resolve().then(() => (init_transcript(), transcript_exports));
   const { close: close2 } = await Promise.resolve().then(() => (init_connection(), connection_exports));
   stopSessionTranscript2();
   await close2();
-  try {
-    opts.rl?.pause();
-  } catch {
-  }
-  const result = spawnSync(process.execPath, process.argv.slice(1), {
+  releaseStdinForRelaunch(opts.rl);
+  const result = spawnSync(process.execPath, relaunchArgv(opts.toVersion), {
     stdio: "inherit",
     env: {
       ...process.env,
@@ -34795,10 +34850,7 @@ async function relaunchIntoHome(opts) {
     }
   });
   if (result.error) {
-    try {
-      opts.rl?.resume();
-    } catch {
-    }
+    reclaimStdinAfterFailedRelaunch(opts.rl);
     return "failed";
   }
   process.exit(result.status ?? 0);
@@ -34808,6 +34860,8 @@ var JUST_UPDATED_ENV;
 var init_relaunch = __esm({
   "src/update/relaunch.ts"() {
     "use strict";
+    init_version();
+    init_registry();
     JUST_UPDATED_ENV = "NTRP_JUST_UPDATED";
   }
 });
@@ -34864,6 +34918,7 @@ async function handler44(_args, ctx) {
       return;
     }
     console.log();
+    console.log(chalk73.dim(`  Starting v${latest}\u2026`));
     const failed = await relaunchIntoHome({
       fromVersion: current,
       toVersion: latest,
@@ -34872,6 +34927,7 @@ async function handler44(_args, ctx) {
     if (failed) {
       const restart = updateRestartSummary(latest);
       console.log(chalk73.green(`  \u2713 Updated! ${restart}`));
+      console.log(chalk73.dim("  Type /exit, then ntrp. This window is still the old process."));
       console.log();
       return restart;
     }
@@ -35280,8 +35336,8 @@ __export(exports_exports, {
   handler: () => handler48
 });
 import chalk78 from "chalk";
-import { existsSync as existsSync31 } from "fs";
-import { join as join35 } from "path";
+import { existsSync as existsSync32 } from "fs";
+import { join as join36 } from "path";
 function usage4() {
   console.log(chalk78.dim("  Usage:"));
   console.log(chalk78.dim("    /exports list [kind]"));
@@ -35338,7 +35394,7 @@ function printInboxShow() {
     console.log("  " + paint("accent", "AI inbox: ") + inbox);
     const latest = inboxLatestHandoffPath();
     if (latest) console.log("  " + chalk78.dim("Latest handoff: ") + latest);
-    console.log("  " + chalk78.dim("Finder skill:   ") + join35(inbox, "SKILL.md"));
+    console.log("  " + chalk78.dim("Finder skill:   ") + join36(inbox, "SKILL.md"));
     console.log("  " + chalk78.dim("Reprint:        ") + paint("accent", "/inbox skill"));
   } else {
     console.log("  " + chalk78.dim("AI inbox: (not set). Type ") + paint("accent", "/inbox set <folder>"));
@@ -35360,8 +35416,8 @@ function printOpen() {
     console.log("  " + chalk78.dim("AI inbox:       ") + inbox);
     const latest = inboxLatestHandoffPath();
     if (latest) console.log("  " + chalk78.dim("Inbox latest:   ") + latest);
-    console.log("  " + chalk78.dim("Pickup skill:   ") + join35(inbox, "latest-pickup.md"));
-    console.log("  " + chalk78.dim("Finder skill:   ") + join35(inbox, "SKILL.md"));
+    console.log("  " + chalk78.dim("Pickup skill:   ") + join36(inbox, "latest-pickup.md"));
+    console.log("  " + chalk78.dim("Finder skill:   ") + join36(inbox, "SKILL.md"));
   } else {
     console.log("  " + chalk78.dim("AI inbox is not set. Type ") + paint("accent", "/inbox set <folder>"));
     const loc = handoffLocations();
@@ -35439,7 +35495,7 @@ function runMove(args, ctx) {
   }
   try {
     const destDir = resolveUserPath(dest);
-    if (!existsSync31(destDir)) {
+    if (!existsSync32(destDir)) {
     }
     const event = moveExport(idOrName, destDir);
     console.log();
@@ -36471,8 +36527,8 @@ Remaining nuances merge into a custom_context paragraph that flows into all AI s
 });
 
 // src/ai/prompt-parts.ts
-import { existsSync as existsSync32, readFileSync as readFileSync23 } from "fs";
-import { join as join36 } from "path";
+import { existsSync as existsSync33, readFileSync as readFileSync23 } from "fs";
+import { join as join37 } from "path";
 function buildCompanyProfileBlock() {
   const p = loadProfile();
   if (!p) return "";
@@ -36490,9 +36546,9 @@ function buildCompanyProfileBlock() {
   return lines.join("\n");
 }
 function loadAnalystFile() {
-  const path = join36(ntrpHome(), ANALYST_FILE_NAME);
+  const path = join37(ntrpHome(), ANALYST_FILE_NAME);
   try {
-    if (!existsSync32(path)) return null;
+    if (!existsSync33(path)) return null;
     const raw = sanitizeExternalText(readFileSync23(path, "utf-8").trim());
     if (!raw) return null;
     if (raw.length <= ANALYST_FILE_MAX_CHARS) return raw;
@@ -36998,7 +37054,7 @@ __export(ingest_chat_exports, {
   loadDemoFromChat: () => loadDemoFromChat,
   looksLikeFilePath: () => looksLikeFilePath
 });
-import { existsSync as existsSync33 } from "fs";
+import { existsSync as existsSync34 } from "fs";
 import { basename as basename9, resolve as resolve9 } from "path";
 import { homedir as homedir8 } from "os";
 import chalk80 from "chalk";
@@ -37018,11 +37074,11 @@ function extractFilePath(input) {
     const m = trimmed.match(re);
     if (m?.[1]) {
       const p = expandPath(m[1]);
-      if (existsSync33(p)) return p;
+      if (existsSync34(p)) return p;
     }
     if (!m?.[1] && re.test(trimmed) && trimmed.toLowerCase().endsWith(".csv")) {
       const p = expandPath(trimmed.replace(/^["']|["']$/g, ""));
-      if (existsSync33(p)) return p;
+      if (existsSync34(p)) return p;
     }
   }
   return null;
@@ -38264,7 +38320,8 @@ __export(welcome_exports, {
   formatEmptyDataHomeHint: () => formatEmptyDataHomeHint,
   formatHomeEntityCounts: () => formatHomeEntityCounts,
   printWelcome: () => printWelcome,
-  resolveWelcomeNextAction: () => resolveWelcomeNextAction
+  resolveWelcomeNextAction: () => resolveWelcomeNextAction,
+  staleProcessHomeNotice: () => staleProcessHomeNotice
 });
 import chalk87 from "chalk";
 function formatHomeEntityCounts(counts) {
@@ -38287,19 +38344,41 @@ function formatEmptyDataHomeHint(savedSessionCount, opts = {}) {
   return chalk87.dim("Type ") + paint("accent", "use demo data") + chalk87.dim(" to load a sample pipeline") + onboard;
 }
 function ntrpStatusRow(version, update) {
+  const disk = readInstalledVersionFromDisk();
   if (update && isNewerVersion(update.latest, version)) {
+    if (disk && !isNewerVersion(update.latest, disk)) {
+      return {
+        label: "ntrp",
+        state: badge("RESTART", "warning"),
+        detail: `v${disk} installed \xB7 type /exit`
+      };
+    }
     return {
       label: "ntrp",
       state: badge("UPDATE", "warning"),
       detail: `v${update.latest} \xB7 type /update`
     };
   }
+  if (disk && isNewerVersion(disk, getInstalledVersion())) {
+    return {
+      label: "ntrp",
+      state: badge("RESTART", "warning"),
+      detail: `v${disk} installed \xB7 type /exit`
+    };
+  }
   return {
     label: "ntrp",
     state: chalk87.dim(`v${version}`),
     detail: ""
   };
 }
+function staleProcessHomeNotice() {
+  const running = getInstalledVersion();
+  const disk = readInstalledVersionFromDisk();
+  if (!disk || disk === running) return null;
+  if (!isNewerVersion(disk, running)) return null;
+  return `This window is still v${running}. Type /exit, then ntrp (v${disk} is installed).`;
+}
 function resolveSessionSummary(input) {
   if (input.scope?.intent_summary?.trim()) return input.scope.intent_summary.trim();
   if (input.summary?.trim()) return input.summary.trim();
@@ -38612,6 +38691,10 @@ async function printWelcome(ctx, version) {
       cardW
     )
   );
+  const stale = staleProcessHomeNotice();
+  if (stale) {
+    push(truncateVisible(` ${paint("warning", "\u2691")} ${stale}`, cardW));
+  }
   if (strategyNudge) {
     push(
       truncateVisible(
@@ -38654,6 +38737,7 @@ var init_welcome = __esm({
     init_queries();
     init_schema();
     init_registry();
+    init_version();
     NO_SUMMARY = "(no summary)";
     CARD_MAX_W = 128;
     CARD_SIDE_MARGIN = 6;
@@ -38818,7 +38902,7 @@ __export(repl_exports, {
 import { createInterface as createInterface2 } from "readline/promises";
 import { clearLine as clearLine2, cursorTo as cursorTo2 } from "readline";
 import chalk88 from "chalk";
-import { join as join37 } from "path";
+import { join as join38 } from "path";
 function buildPrompt(ctx) {
   return buildConversationPrompt(ctx);
 }
@@ -38921,7 +39005,7 @@ async function goHome(ctx, version, history, opts) {
   ctx.wizardDepth = 0;
   ctx.secretInputActive = false;
   history.length = 0;
-  process.stdout.write("\x1B[2J\x1B[H");
+  clearTerminalHome();
   if (opts?.banner) {
     console.log();
     console.log("  " + paint("accent", "\u2713") + " " + chalk88.dim(opts.banner));
@@ -39183,7 +39267,7 @@ function printHelp() {
     ["/remember <fact>", "Store a fact, a decision, or a preference"],
     ["/recall [topic]", "Show what NTRP stores about your business"],
     ["/rate good|bad <note>", "Correct the last answer. A bad note becomes a calibration"],
-    [`${join37(ntrpHome(), ANALYST_FILE_NAME)}`, "Standing operator instructions (tone, priorities, house rules)"]
+    [`${join38(ntrpHome(), ANALYST_FILE_NAME)}`, "Standing operator instructions (tone, priorities, house rules)"]
   ];
   const teachMaxW = Math.max(...teach.map(([c]) => c.length)) + 2;
   for (const [cmd, desc] of teach) {
@@ -39301,6 +39385,7 @@ init_activation();
 init_gate2();
 init_profile();
 init_theme();
+init_layout();
 init_emit();
 init_errors2();
 init_types2();
@@ -39348,13 +39433,13 @@ async function main() {
   if (args.oneShot) {
     const cmd = firstToken(args.input);
     if (!UNGATED.has(cmd)) {
-      const lic2 = await refreshLicenseOnline();
-      if (!lic2.valid) {
+      const lic = await refreshLicenseOnline();
+      if (!lic.valid) {
         if (isStructuredOutput(ctx.execution)) {
-          emitError(cmd || "ntrp", new NtrpError("license_invalid", lic2.message, 3 /* Auth */));
+          emitError(cmd || "ntrp", new NtrpError("license_invalid", lic.message, 3 /* Auth */));
         }
         console.error(chalk89.red(`
-  ${lic2.message}`));
+  ${lic.message}`));
         console.error(chalk89.dim("  Trial's over \u2014 /upgrade and paste your key.\n"));
         process.exit(1);
       }
@@ -39400,31 +39485,37 @@ async function main() {
     }
     return DB_COMMANDS.has(cmd);
   }
-  const showedActivation = await ensureLicenseActivated(ctx);
-  const lic = await refreshLicenseOnline();
-  if (lic.shouldNudgeUpgrade) {
-    const { printTrialNudge: printTrialNudge2 } = await Promise.resolve().then(() => (init_upgrade(), upgrade_exports));
-    printTrialNudge2(lic);
+  const { consumeJustUpdatedEnv: consumeJustUpdatedEnv2 } = await Promise.resolve().then(() => (init_relaunch(), relaunch_exports));
+  const justUpdated = consumeJustUpdatedEnv2();
+  let showedActivation = false;
+  if (!justUpdated) {
+    showedActivation = await ensureLicenseActivated(ctx);
+    const lic = await refreshLicenseOnline();
+    if (lic.shouldNudgeUpgrade) {
+      const { printTrialNudge: printTrialNudge2 } = await Promise.resolve().then(() => (init_upgrade(), upgrade_exports));
+      printTrialNudge2(lic);
+    }
   }
   void Promise.resolve().then(() => (init_discovery(), discovery_exports)).then((m) => m.refreshStaleProviderCaches()).catch(() => void 0);
   const { setActiveDbPath: setActiveDbPath2 } = await Promise.resolve().then(() => (init_connection(), connection_exports));
   const { datasetPathForSession: datasetPathForSession2 } = await Promise.resolve().then(() => (init_context2(), context_exports));
   ctx.datasetPath = datasetPathForSession2(ctx.sessionId);
   await setActiveDbPath2(ctx.datasetPath);
-  const { completeInteractiveSetup: completeInteractiveSetup2 } = await Promise.resolve().then(() => (init_first_run(), first_run_exports));
   const {
     hydrateUpdateAvailableFromCache: hydrateUpdateAvailableFromCache2,
     startBackgroundUpdateCheck: startBackgroundUpdateCheck2
   } = await Promise.resolve().then(() => (init_registry(), registry_exports));
-  const { consumeJustUpdatedEnv: consumeJustUpdatedEnv2 } = await Promise.resolve().then(() => (init_relaunch(), relaunch_exports));
   ctx.updateAvailable = hydrateUpdateAvailableFromCache2(VERSION);
   startBackgroundUpdateCheck2(ctx);
-  await completeInteractiveSetup2(ctx, { skipBrand: showedActivation });
+  if (!justUpdated) {
+    const { completeInteractiveSetup: completeInteractiveSetup2 } = await Promise.resolve().then(() => (init_first_run(), first_run_exports));
+    await completeInteractiveSetup2(ctx, { skipBrand: showedActivation });
+  }
   const { startSessionTranscript: startSessionTranscript2, stopSessionTranscript: stopSessionTranscript2 } = await Promise.resolve().then(() => (init_transcript(), transcript_exports));
   startSessionTranscript2(ctx);
   const { printWelcome: printWelcome2 } = await Promise.resolve().then(() => (init_welcome(), welcome_exports));
-  const justUpdated = consumeJustUpdatedEnv2();
   if (justUpdated) {
+    clearTerminalHome();
     console.log();
     console.log("  " + paint("accent", "\u2713") + " " + chalk89.dim(`Now running v${justUpdated.to}`));
   }

package/dist/mcp/server.js

@@ -26282,22 +26282,29 @@ var init_setup = __esm({
 import { existsSync as existsSync26, readFileSync as readFileSync22 } from "fs";
 import { dirname as dirname5, join as join26 } from "path";
 import { fileURLToPath } from "url";
+function readVersionFromPackageJson(packageJsonPath) {
+  if (!existsSync26(packageJsonPath)) return null;
+  try {
+    const pkg = JSON.parse(readFileSync22(packageJsonPath, "utf-8"));
+    if (typeof pkg.version === "string" && pkg.version.length > 0) return pkg.version;
+  } catch {
+  }
+  return null;
+}
+function readVersionNearEntry(entryPath) {
+  const start = dirname5(entryPath);
+  for (const rel of [join26(start, "..", "package.json"), join26(start, "../..", "package.json")]) {
+    const version = readVersionFromPackageJson(rel);
+    if (version) return version;
+  }
+  return null;
+}
+function readInstalledVersionFromDisk() {
+  return readVersionNearEntry(fileURLToPath(import.meta.url));
+}
 function getInstalledVersion() {
   if (cachedVersion) return cachedVersion;
-  const start = dirname5(fileURLToPath(import.meta.url));
-  for (const rel of ["../package.json", "../../package.json"]) {
-    const path = join26(start, rel);
-    if (!existsSync26(path)) continue;
-    try {
-      const pkg = JSON.parse(readFileSync22(path, "utf-8"));
-      if (typeof pkg.version === "string" && pkg.version.length > 0) {
-        cachedVersion = pkg.version;
-        return cachedVersion;
-      }
-    } catch {
-    }
-  }
-  cachedVersion = "0.0.0";
+  cachedVersion = readInstalledVersionFromDisk() ?? "0.0.0";
   return cachedVersion;
 }
 var cachedVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonnechasser/ntrp",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "GTM Health Diagnostic CLI — local pipeline analysis tool",
   "homepage": "https://ntrp.sonnechasser.com",
   "repository": {