@sonnechasser/ntrp 0.1.7 → 0.1.8

package/dist/whimsy/time-bank-smoke.js

@@ -221,12 +221,15 @@ function getInstallId() {
   return ensureInstall().install_id;
 }
 function invalidateInstall() {
-  cachedInstall = null;
+  clearInstallCache();
   const path = installPath();
   if (existsSync2(path)) {
     unlinkSync(path);
   }
 }
+function clearInstallCache() {
+  cachedInstall = null;
+}
 var cachedInstall;
 var init_install = __esm({
   "src/config/install.ts"() {
@@ -465,12 +468,20 @@ function saveProgress(state) {
 function invalidateProgress() {
   installMismatchWarned = false;
   invalidateInstall();
+  wipeProgressFiles();
+}
+function wipeProgressFiles() {
+  installMismatchWarned = false;
   for (const path of [progressPath2(), legacyStatePath2(), legacyStateBackupPath2()]) {
     if (existsSync4(path)) {
       unlinkSync2(path);
     }
   }
 }
+function resetProgress() {
+  ensureInstall();
+  wipeProgressFiles();
+}
 function appendCredit(state, credit) {
   const credits = [...state.credits, credit];
   if (credits.length > CREDIT_HISTORY_CAP) {
@@ -678,7 +689,7 @@ var init_connection = __esm({
 // src/services/scratch-wipe.ts
 import { existsSync as existsSync6, rmSync as rmSync2, unlinkSync as unlinkSync3 } from "fs";
 import { join as join6 } from "path";
-async function performScratchWipe() {
+async function performScratchWipe(opts = {}) {
   const home = ntrpHome();
   const removed = [];
   try {
@@ -697,6 +708,13 @@ async function performScratchWipe() {
     { path: join6(home, "sessions"), kind: "dir" },
     { path: join6(home, "datasets"), kind: "dir" }
   ];
+  if (opts.includeProgress) {
+    targets.push(
+      { path: join6(home, "install.json"), kind: "file" },
+      { path: join6(home, "progress.json"), kind: "file" },
+      { path: join6(home, "state.json"), kind: "file" }
+    );
+  }
   for (const { path, kind } of targets) {
     if (!existsSync6(path)) continue;
     try {
@@ -709,12 +727,18 @@ async function performScratchWipe() {
     } catch {
     }
   }
+  if (opts.includeProgress) {
+    wipeProgressFiles();
+    clearInstallCache();
+  }
   resetConfigCache();
   return { removed };
 }
 var init_scratch_wipe = __esm({
   "src/services/scratch-wipe.ts"() {
     "use strict";
+    init_install();
+    init_progress();
     init_store();
   }
 });
@@ -18939,15 +18963,22 @@ __export(scratch_exports, {
   handler: () => handler18
 });
 import chalk33 from "chalk";
-function printScratchPreamble() {
+function printScratchPreamble(includeProgress) {
   console.log();
   console.log("  " + chalk33.yellow.bold("This will permanently remove:"));
   console.log("  " + chalk33.dim("  \u2022 API key and all config.json settings"));
   console.log("  " + chalk33.dim("  \u2022 Company profile (you'll re-onboard on next use)"));
   console.log("  " + chalk33.dim("  \u2022 All sessions and datasets"));
   console.log("  " + chalk33.dim("  \u2022 Demo taxonomy cache"));
+  if (includeProgress) {
+    console.log("  " + chalk33.dim("  \u2022 Progress (hours saved) and install identity"));
+  }
   console.log();
-  console.log("  " + chalk33.dim("Preserved: progress (hours saved), memory, strategies, wins, knowledge, exports, audit"));
+  if (includeProgress) {
+    console.log("  " + chalk33.dim("Preserved: memory, strategies, wins, knowledge, exports, audit"));
+  } else {
+    console.log("  " + chalk33.dim("Preserved: progress (hours saved), memory, strategies, wins, knowledge, exports, audit"));
+  }
   console.log();
 }
 function resetContextAfterScratch(ctx) {
@@ -18969,24 +19000,26 @@ function resetContextAfterScratch(ctx) {
   ctx.lastExchange = void 0;
 }
 async function handler18(args, ctx) {
-  const { flags } = parseArgs(args, ["confirm"]);
+  const { flags } = parseArgs(args, ["confirm", "include-progress"]);
   const confirmedFlag = getBool(flags, "confirm");
+  const includeProgress = getBool(flags, "include-progress");
   const ok = await requireTypedWord(ctx, {
-    title: "Factory reset",
+    title: includeProgress ? "Factory reset (including progress)" : "Factory reset",
     word: "scratch",
     confirmedFlag,
-    preamble: printScratchPreamble
+    preamble: () => printScratchPreamble(includeProgress)
   });
   if (!ok) {
     printAdminCancelled("Scratch", 'Type "scratch" exactly to confirm.');
     return "Scratch cancelled";
   }
-  await performScratchWipe();
+  await performScratchWipe({ includeProgress });
   resetContextAfterScratch(ctx);
   await rotateToFreshSession(ctx);
   await initSchema();
   console.log();
-  console.log("  " + paint("accent", "\u2713 Scratch complete") + chalk33.dim(" \u2014 local config and data wiped."));
+  const detail = includeProgress ? " \u2014 local config, data, and progress wiped." : " \u2014 local config and data wiped.";
+  console.log("  " + paint("accent", "\u2713 Scratch complete") + chalk33.dim(detail));
   console.log();
   if (ctx.oneShot) {
     console.log(
@@ -23089,7 +23122,18 @@ var progress_exports = {};
 __export(progress_exports, {
   handler: () => handler44
 });
-async function handler44(_args, _ctx) {
+import chalk62 from "chalk";
+function printProgressResetPreamble() {
+  console.log();
+  console.log("  " + chalk62.yellow.bold("This will permanently remove:"));
+  console.log("  " + chalk62.dim("  \u2022 Hours saved and milestone unlocks"));
+  console.log("  " + chalk62.dim("  \u2022 Usage counters and weekly activity rollups"));
+  console.log("  " + chalk62.dim("  \u2022 Credit history used for dedup"));
+  console.log();
+  console.log("  " + chalk62.dim("Preserved: install identity (install.json)"));
+  console.log();
+}
+function showProgress() {
   const bank = getTimeBankSummary();
   if (bank.total_minutes <= 0) {
     console.log();
@@ -23100,10 +23144,53 @@ async function handler44(_args, _ctx) {
   renderProgressReport();
   return `Progress: ${bank.total_hours.toFixed(1)}h saved`;
 }
+async function handleReset(ctx, confirmedFlag) {
+  const bank = getTimeBankSummary();
+  if (bank.total_minutes <= 0) {
+    console.log();
+    console.log("  " + chalk62.dim("No progress to reset."));
+    console.log();
+    return "No progress to reset";
+  }
+  const ok = await requireTypedWord(ctx, {
+    title: "Reset progress",
+    word: "reset",
+    confirmedFlag,
+    preamble: printProgressResetPreamble,
+    oneShotHint: "Re-run with: ntrp progress reset --confirm"
+  });
+  if (!ok) {
+    printAdminCancelled("Progress reset", 'Type "reset" exactly to confirm.');
+    return "Progress reset cancelled";
+  }
+  resetProgress();
+  console.log();
+  console.log("  " + paint("accent", "\u2713 Progress reset") + chalk62.dim(" \u2014 hours and milestones cleared."));
+  console.log();
+  return "Progress reset";
+}
+async function handler44(args, ctx) {
+  const { positional, flags } = parseArgs(args, ["confirm"]);
+  const sub = positional[0]?.toLowerCase();
+  if (sub === "reset") {
+    return handleReset(ctx, getBool(flags, "confirm"));
+  }
+  if (sub && sub !== "reset") {
+    console.log();
+    console.log("  " + chalk62.dim("Unknown subcommand. Try ") + paint("accent", "/progress") + chalk62.dim(" or ") + paint("accent", "/progress reset") + chalk62.dim("."));
+    console.log();
+    return;
+  }
+  return showProgress();
+}
 var init_progress2 = __esm({
   "src/commands/progress.ts"() {
     "use strict";
+    init_argparse();
+    init_admin_confirm();
+    init_progress();
     init_progress_report();
+    init_theme();
     init_time_bank();
   }
 });
@@ -23667,11 +23754,13 @@ Export the most recent diagnosis as terminal output, markdown, or JSON. Use
 name: progress
 description: Usage stats and milestone ladder
 section: Navigation
+args: [reset] [--confirm]
 handler: ../commands/progress.ts
 ---
 
 Hours saved, weekly activity trend, session counts, AI token usage, and the
-full milestone ladder with progress bars.`
+full milestone ladder with progress bars. Use reset (type "reset" to confirm)
+to clear hours and milestones while keeping this install's identity.`
   },
   {
     name: "status",
@@ -23691,15 +23780,17 @@ diagnosis, if any.`
 name: scratch
 description: Wipe config, profile, and all datasets
 section: Admin
-args: [--confirm]
+args: [--confirm] [--include-progress]
 handler: ../commands/scratch.ts
 hidden: true
 ---
 
 Minimal factory reset: removes API key, config, company profile, all sessions,
-per-session datasets, and demo taxonomy cache. Preserves progress (hours saved), memory, strategies,
-wins, knowledge, exports, and audit. Requires typing \`scratch\` in the REPL
-or passing \`--confirm\` one-shot. Triggers onboarding on next interactive use.`
+per-session datasets, and demo taxonomy cache. Preserves progress (hours saved)
+by default. Pass \`--include-progress\` to also wipe install identity and hours.
+Also preserves memory, strategies, wins, knowledge, exports, and audit. Requires
+typing \`scratch\` in the REPL or passing \`--confirm\` one-shot. Triggers
+onboarding on next interactive use.`
   },
   {
     name: "cleanup",
@@ -24135,6 +24226,29 @@ function testInstallIdStable() {
     assert(id1 === id2, "install_id stable across loads");
   });
 }
+function testResetProgressKeepsInstall() {
+  withTempHome(() => {
+    const ctx = mockCtx();
+    recordTimeCredit("diagnose", ctx, { silent: true });
+    const installId = getInstallId();
+    resetProgress();
+    assert(loadProgress().total_minutes_saved === 0, "reset should clear hours");
+    assert(getInstallId() === installId, "reset should keep install_id");
+    assert(existsSync21(join28(ntrpHome(), "install.json")), "install.json should remain");
+  });
+}
+async function testScratchIncludeProgressWipesHours() {
+  await withTempHomeAsync(async () => {
+    const ctx = mockCtx();
+    recordTimeCredit("diagnose", ctx, { silent: true });
+    const installId = getInstallId();
+    await performScratchWipe({ includeProgress: true });
+    assert(!existsSync21(join28(ntrpHome(), "install.json")), "include-progress should remove install.json");
+    const state = loadProgress();
+    assert(state.total_minutes_saved === 0, "include-progress should clear hours");
+    assert(state.install_id !== installId, "include-progress should issue new install_id");
+  });
+}
 testCreditDedup();
 testMilestoneBoundary();
 testNextMilestone();
@@ -24150,12 +24264,14 @@ testUsageBackfillFromCredits();
 testInstallCreatedOnFirstLoad();
 testLegacyStateMigration();
 testInstallIdStable();
+testResetProgressKeepsInstall();
 async function testProgressCommandRegistered() {
   assert(hasCommand("progress"), "/progress should be in workflow registry");
   const handler45 = await resolveHandler("progress");
   assert(typeof handler45 === "function", "progress handler should load from importHandler map");
 }
 await testProgressSurvivesScratchWipe();
+await testScratchIncludeProgressWipesHours();
 await testProgressCommandRegistered();
 console.log("time bank smoke passed");
 //# sourceMappingURL=time-bank-smoke.js.map