@kitkat-vn/kitcode 0.2.0-staging.3 → 0.2.0-staging.4

package/README.md

@@ -1,6 +1,6 @@
 # @kitkat-vn/kitcode
 
-Local break companion for coding campaigns. This package is the **source of truth** for tracking, reward eligibility, redeem state, hooks, and the local Mini companion.
+Local break companion for coding campaigns. This package is the **source of truth** for tracking, the milestones reached, hooks, and the local Mini companion.
 
 Published package: `@kitkat-vn/kitcode`
 
@@ -189,26 +189,21 @@ The time target is fixed at `3600` active seconds: no flag or variable changes i
 Each milestone needs both enough active time and enough counted `=`:
 
 - time target for a percent = `ceil(3600 * percent / 100)` seconds: 360 for 10%, 720 for 20%, 1080 for 30%, 1800 for 50%, and 3600 for 100%
-- equals target comes from the tier table below
+- equals target comes from the table below
 
-### Local reward tiers
+### Milestones
 
-Their break codes are shown in the dashboard, which records a code as shown through `POST /api/reward/redeem`, on this machine only.
+| Milestone | Required counted `=` |
+| ---: | ---: |
+| `10%` | 3 |
+| `20%` | 6 |
+| `30%` | 9 |
+| `50%` | 12 |
+| `100%` | 15 |
 
-| Tier | Code | Required counted `=` |
-| ---: | --- | ---: |
-| `10%` | `if(tired){return 10;}` | 3 |
-| `20%` | `takeBreak(20);` | 6 |
-| `30%` | `while(working)break(30);` | 9 |
+Once a milestone is reached, the dashboard shows its message: the campaign's own words, which the campaign's server gives each milestone. The prompt hook and the desktop notification say only that a milestone was reached. `summary` and `awards` show which are ready.
 
-### Display milestones
-
-Shown in summary/awards/dashboard, but not redeemable unless backed by campaign flow.
-
-| Milestone | Code | Required counted `=` |
-| ---: | --- | ---: |
-| `50%` | `mediumStake.unlock(50);` | 12 |
-| `100%` | `finalBreak.claim(100);` | 15 |
+Until 2026-10-01 each milestone had a break code, a line of code shown in the dashboard, which recorded it as shown on this machine. The codes are gone, and nothing records one as shown; a code an earlier version recorded as shown stays in `~/.kitcode/state.json`, and its milestone reads as ready.
 
 ## Codex and Claude integrations
 
@@ -267,18 +262,16 @@ GET  /api/projects
 GET  /api/events
 GET  /api/claim/bundle
 GET  /companion
-POST /api/reward/redeem
 ```
 
-The API answers only requests addressed to `127.0.0.1` or `localhost` on its port, and web pages only from an allowed origin (below) or its own. `GET /api/claim/bundle` and `POST /api/reward/redeem` need an allowed origin, and the POST a JSON body.
+The API answers only requests addressed to `127.0.0.1` or `localhost` on its port, and web pages only from an allowed origin (below) or its own. `GET /api/claim/bundle` needs an allowed origin; every `POST` needs an allowed origin and a JSON body, and none is left that changes anything.
 
 `/api/events` is SSE and emits `summary` every second.
 
-`POST /api/reward/redeem` accepts optional `{ "tier": 10 }`. If `tier` is omitted, all ready local tiers are redeemed.
-
 Legacy endpoints return `410 Gone`:
 
 ```txt
+POST /api/reward/redeem
 GET  /api/projects/:id/commits
 POST /api/projects/:id/start
 POST /api/projects/:id/stop

package/bin/kitcode.mjs

@@ -267,7 +267,8 @@ function formatDuration(seconds) {
 }
 
 // The numbers come from the summary: the same ones the Mini and the dashboard show
-// (docs/reward-rules.md §10).
+// (docs/reward-rules.md §10). The next milestone follows the ready ones: until 2026-10-01 a ready milestone hid it, and
+// showing a 10–30 % code was what cleared one; with the codes gone nothing does (docs/reward-rules.md §7).
 function printRewardSummary() {
   const reward = getDiskRewardSummary();
   const next = reward.nextBreak;
@@ -280,7 +281,6 @@ function printRewardSummary() {
 
   if (ready.length > 0) {
     console.log(`  ready: ${ready.map((milestone) => `${milestone.percent}%`).join(', ')}`);
-    return;
   }
 
   if (next) {
@@ -289,16 +289,16 @@ function printRewardSummary() {
   }
 }
 
-// A redeemed tier's code was shown, on this machine only: nothing is claimed with the campaign
-// (operator decision, 2026-09-24). The API keeps its `redeemed` status, which the deployed dashboard reads.
+// Each milestone, locked or ready. Since 2026-10-01 none has a code (the operator's decision 6): a tier whose code an
+// earlier version recorded as shown keeps its `redeemed` status in the API, and reads as ready here, a milestone reached;
+// until then it read "code shown", and the 10–30 % tiers "reward".
 function printAwards() {
   const reward = getDiskRewardSummary();
 
   console.log('KitCode awards');
   for (const milestone of reward.milestones) {
-    const label = milestone.rewardBacked ? 'reward' : 'milestone';
-    const status = milestone.status === 'redeemed' ? 'code shown' : milestone.status;
-    console.log(`  ${milestone.percent}% ${label}: ${status} (${milestoneProgressPercent(reward, milestone)}%)`);
+    const status = milestone.status === 'redeemed' ? 'ready' : milestone.status;
+    console.log(`  ${milestone.percent}% milestone: ${status} (${milestoneProgressPercent(reward, milestone)}%)`);
   }
 }
 
@@ -443,7 +443,7 @@ function openElectronEntry(entryName, environment = {}) {
 
 function printElectronSetupHelp() {
   console.error('KitCode setup needs Electron for the desktop folder picker.');
-  console.error("Reinstall the tester build: download kitcode-0.2.0-staging.3.tgz again from the staging site, https://staging.kitcode.vn/, then run npm install -g ./kitcode-0.2.0-staging.3.tgz in the folder you saved it to.");
+  console.error("Reinstall the tester build: download kitcode-0.2.0-staging.4.tgz again from the staging site, https://staging.kitcode.vn/, then run npm install -g ./kitcode-0.2.0-staging.4.tgz in the folder you saved it to.");
   console.error('If install succeeded but Electron is still missing, fix npm cache permissions and reinstall.');
 }
 
@@ -458,7 +458,7 @@ function printElectronLaunchFailure(result, label) {
 
   if (result?.reason === 'electron-binary-missing') {
     console.error(`Electron's binary is missing: Electron points to ${result.detail}, and nothing is there.`);
-    console.error("Reinstall the tester build: download kitcode-0.2.0-staging.3.tgz again from the staging site, https://staging.kitcode.vn/, then run npm install -g ./kitcode-0.2.0-staging.3.tgz in the folder you saved it to.");
+    console.error("Reinstall the tester build: download kitcode-0.2.0-staging.4.tgz again from the staging site, https://staging.kitcode.vn/, then run npm install -g ./kitcode-0.2.0-staging.4.tgz in the folder you saved it to.");
     return;
   }
 
@@ -701,7 +701,7 @@ function bindRefusal(options) {
 }
 
 function nonLoopbackWarning(options) {
-  return `Warning: KitCode's local API will listen on ${options.host}:${options.port}, where other machines may reach it. It has no authentication. It answers only requests addressed to 127.0.0.1 or localhost: that stops web pages, not other programs, and any program that can connect to it can read your progress and mark your break codes as shown.`;
+  return `Warning: KitCode's local API will listen on ${options.host}:${options.port}, where other machines may reach it. It has no authentication. It answers only requests addressed to 127.0.0.1 or localhost: that stops web pages, not other programs, and any program that can connect to it can read your progress.`;
 }
 
 function sleep(ms) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitkat-vn/kitcode",
-  "version": "0.2.0-staging.3",
+  "version": "0.2.0-staging.4",
   "description": "Local aggregate activity server for KitCode.",
   "license": "MIT",
   "repository": {
@@ -37,5 +37,5 @@
   "optionalDependencies": {
     "electron": "^43.0.0"
   },
-  "gitHead": "ac0e5e53e90fc09132dabc63474e01e962f50a6d"
+  "gitHead": "ed3ca58fd6379cf7cfa15824f451773f092fb6d5"
 }

package/src/api.mjs

@@ -6,14 +6,20 @@ import {renderCompanionWindow} from './companion-window.mjs';
 import {INSTALL_ID_DISPLAY_PATH, InstallIdError, readInstallId} from './install-id.mjs';
 import {STATE_DISPLAY_PATH} from './integration-spec.mjs';
 import {MilestoneRecordError} from './milestones-reached.mjs';
-import {buildSummary, persistRuntimeState, refreshRuntimeLedger} from './runtime.mjs';
-import {normalizeTierPercent, redeemReadyTiers} from './reward.mjs';
+import {buildSummary} from './runtime.mjs';
 import {loadState, StateFileError} from './store.mjs';
 
 const projectLevelGone = (_req, res) => {
   res.status(410).json({error: 'Project-level metadata is no longer exposed'});
 };
 
+// The route that recorded a 10–30 % break code as shown, in state.json, gone with the codes on 2026-10-01 (the operator's
+// decision 6; docs/reward-rules.md §7): each milestone reached shows its message on the dashboard instead. It records
+// nothing for anyone; a dashboard from before, which still sends it, reads why in fixed words.
+const redeemGone = (_req, res) => {
+  res.status(410).json({error: 'Break codes are no longer shown or recorded: each milestone reached shows its message on the dashboard.'});
+};
+
 export function createServer(runtime, version) {
   const app = express();
   let openEventStreams = 0;
@@ -54,24 +60,7 @@ export function createServer(runtime, version) {
     res.json(buildSummary(runtime).global);
   });
 
-  app.post('/api/reward/redeem', (req, res) => {
-    const requestedTier = req.body?.tier;
-
-    if (requestedTier !== undefined && !normalizeTierPercent(requestedTier)) {
-      res.status(400).json({error: 'Invalid reward tier'});
-      return;
-    }
-
-    // Readiness is judged from the file, so the tracker's latest time goes there first.
-    persistRuntimeState(runtime);
-    const result = redeemReadyTiers(requestedTier === undefined ? null : requestedTier);
-    refreshRuntimeLedger(runtime);
-
-    res.json({
-      ...result,
-      summary: buildSummary(runtime),
-    });
-  });
+  app.post('/api/reward/redeem', redeemGone);
 
   // The claim bundle (docs/backend.md, "The contract"): totals only, from state.json as it is on disk,
   // which this reads and never writes. Only the dashboard's allow-listed origins get it, where

package/src/companion-window.mjs

@@ -26,7 +26,6 @@ button{cursor:pointer}
 .metric-value{color:var(--white-text);font-family:var(--font-pixel),var(--font-mono);font-size:24px;line-height:1;margin-bottom:2px;letter-spacing:.5px;white-space:nowrap}
 .metric-label{color:var(--red-color);font-family:var(--font-mono);font-size:7px;font-weight:500;letter-spacing:.3px;text-transform:uppercase;white-space:nowrap}
 .claim-btn{-webkit-app-region:no-drag;background:transparent;color:var(--white-text);font-family:var(--font-mono);font-size:10px;font-weight:500;letter-spacing:1px;padding:3px 12px;cursor:pointer;text-transform:uppercase;border-top:2px solid var(--red-color);border-bottom:2px solid var(--red-color);border-left:1px dashed var(--red-color);border-right:1px dashed var(--red-color);white-space:normal;width:min-content;line-height:1.15;transition:background-color .2s ease}
-.claim-btn[data-ready="true"]{background:rgba(240,48,48,.18)}
 .claim-btn:hover,.claim-btn:focus-visible{background:rgba(240,48,48,.15);outline:none}
 .offline .percentage,.offline .metric-value{color:#6f6f6f}
 .offline .progress-row{color:#6f6f6f}
@@ -36,8 +35,8 @@ ${COMPANION_HIDE_CSS}
 const API_BASE=${JSON.stringify(apiBase)};const percent=document.getElementById('percent'),countValue=document.getElementById('countValue'),workedValue=document.getElementById('workedValue'),idleValue=document.getElementById('idleValue'),progressFill=document.getElementById('progressFill'),main=document.getElementById('main'),dashboardButton=document.getElementById('dashboardButton');
 function formatDuration(seconds){const totalSeconds=Math.max(0,Math.floor(Number(seconds)||0));if(totalSeconds<60)return totalSeconds+'s';const hours=Math.floor(totalSeconds/3600),minutes=Math.floor((totalSeconds%3600)/60);if(hours>0)return minutes>0?hours+'h '+minutes+'m':hours+'h';return minutes+'m'}
 function updateProgress(value){progressFill.style.width=Math.max(0,Math.min(100,Number(value)||0))+'%'}
-function render(summary){const reward=summary?.reward||{},global=summary?.global||{},tiers=reward.tiers||[],ready=tiers.some((tier)=>tier.status==='ready'),value=Math.max(0,Math.min(100,Math.floor(Number(reward.progressPercent)||0)));percent.textContent=value+'%';countValue.textContent=String(Math.max(0,Math.floor(Number(reward.totalEquals)||0)));workedValue.textContent=formatDuration(global.totalActiveSeconds);idleValue.textContent=formatDuration(global.totalIdleSeconds);updateProgress(value);dashboardButton.dataset.ready=ready?'true':'false';main.classList.remove('offline')}
-function offline(){percent.textContent='--';countValue.textContent='--';workedValue.textContent='--';idleValue.textContent='--';updateProgress(0);dashboardButton.dataset.ready='false';main.classList.add('offline')}
+function render(summary){const reward=summary?.reward||{},global=summary?.global||{},value=Math.max(0,Math.min(100,Math.floor(Number(reward.progressPercent)||0)));percent.textContent=value+'%';countValue.textContent=String(Math.max(0,Math.floor(Number(reward.totalEquals)||0)));workedValue.textContent=formatDuration(global.totalActiveSeconds);idleValue.textContent=formatDuration(global.totalIdleSeconds);updateProgress(value);main.classList.remove('offline')}
+function offline(){percent.textContent='--';countValue.textContent='--';workedValue.textContent='--';idleValue.textContent='--';updateProgress(0);main.classList.add('offline')}
 async function sync(){try{const response=await fetch(API_BASE+'/api/summary');if(!response.ok)throw new Error();render(await response.json())}catch{offline()}}
 const hideButton=document.getElementById('hideButton');function hideCompanion(){try{const result=window.kitcodeCompanion?.hide?.();if(result&&typeof result.catch==='function')result.catch(()=>window.close());if(!result)window.close()}catch{window.close()}}
 hideButton.addEventListener('pointerdown',(event)=>event.stopPropagation());hideButton.addEventListener('click',(event)=>{event.stopPropagation();hideCompanion()});
@@ -46,12 +45,15 @@ dashboardButton.addEventListener('click',()=>{if(window.kitcodeCompanion?.openDa
 sync();const events=new EventSource(API_BASE+'/api/events');events.addEventListener('summary',(event)=>{try{render(JSON.parse(event.data))}catch{offline()}});events.onerror=offline;
 `;
 
-  // The button opens the dashboard, where a ready code is shown: "Show code", not a claim (operator
-  // decision, 2026-09-24). It wraps onto two lines, as KITCODE COUNTER does on the left: on one line
-  // it took 28 px from the counters, which then ran into each other at long-campaign values
-  // (measured in the 560 x 76 window with 2500 = and 11h 48m).
+  // The button opens the dashboard, where each milestone reached shows its message: "See more". Until 2026-10-01 it was
+  // "Show code", and lit while a 10–30 % code was ready to show there; the break codes are gone (the operator's decision
+  // 6), and a milestone reached stays reached, so nothing lights it now. The Mini cannot show a message itself: the
+  // messages are the claim backend's, and the tracker, which serves this page, never talks to it. Two short words, which
+  // wrap onto two lines, as KITCODE COUNTER does on the left: "Dashboard" or "Messages" took 28 to 35 px more, and the
+  // counters then ran into each other at long-campaign values (measured in the 560 x 76 window with 2500 = and
+  // 11h 48m, 2026-09-24 and 2026-10-01).
   return `<!doctype html>
 <html lang="en"><head><meta charset="utf-8"><meta http-equiv="Content-Security-Policy" content="${contentSecurityPolicy({script, style, connect: [apiBase || "'self'"]})}"><meta name="viewport" content="width=device-width, initial-scale=1">
 <title>KitCode Counter</title><style>${style}</style></head>
-<body><main class="widget-window" id="main" data-testid="companion-counter-bar">${renderCompanionTitleBar()}<div class="widget-body"><div class="brand-label" aria-label="KitCode Counter">KITCODE<br>COUNTER</div><strong class="percentage" id="percent" data-testid="mini-percent">--</strong><div class="progress-box" aria-hidden="true"><div class="progress-fill" id="progressFill"><div class="progress-row">========================</div><div class="progress-row">========================</div></div></div><div class="metrics-group" aria-label="KitCode counters"><div class="metric-item"><div class="metric-value" id="countValue" data-testid="mini-count">--</div><div class="metric-label">= COUNT</div></div><div class="metric-item"><div class="metric-value" id="workedValue" data-testid="mini-worked">--</div><div class="metric-label">WORKED</div></div><div class="metric-item"><div class="metric-value" id="idleValue" data-testid="mini-idle">--</div><div class="metric-label">IDLE</div></div></div><button class="claim-btn" id="dashboardButton" data-testid="companion-dashboard" type="button" data-ready="false">Show code</button></div></main><script>${script}</script></body></html>`;
+<body><main class="widget-window" id="main" data-testid="companion-counter-bar">${renderCompanionTitleBar()}<div class="widget-body"><div class="brand-label" aria-label="KitCode Counter">KITCODE<br>COUNTER</div><strong class="percentage" id="percent" data-testid="mini-percent">--</strong><div class="progress-box" aria-hidden="true"><div class="progress-fill" id="progressFill"><div class="progress-row">========================</div><div class="progress-row">========================</div></div></div><div class="metrics-group" aria-label="KitCode counters"><div class="metric-item"><div class="metric-value" id="countValue" data-testid="mini-count">--</div><div class="metric-label">= COUNT</div></div><div class="metric-item"><div class="metric-value" id="workedValue" data-testid="mini-worked">--</div><div class="metric-label">WORKED</div></div><div class="metric-item"><div class="metric-value" id="idleValue" data-testid="mini-idle">--</div><div class="metric-label">IDLE</div></div></div><button class="claim-btn" id="dashboardButton" data-testid="companion-dashboard" type="button" title="Open the dashboard, where each milestone reached shows its message">See more</button></div></main><script>${script}</script></body></html>`;
 }

package/src/git.mjs

@@ -182,11 +182,24 @@ const OWN_COMMIT = /^commit(?: \((?:amend|initial)\))?:(?: |$)/;
 // names are 40 hex characters, or 64 in a SHA-256 repository.
 const REFLOG_LINE = /^([0-9a-f]{40}|[0-9a-f]{64}) ([0-9a-f]{40}|[0-9a-f]{64}) [^\t]*(?:\t(.*))?$/;
 
-// The files git leaves while an operation waits for the user: a merge (a pull's, too) stopped on a
-// conflict or run with --no-commit, a cherry-pick, a revert, a rebase, `git am`, and a squash merge not
-// yet committed. What they brought is in the working tree before any reflog line says so.
-const WAITING_OPERATIONS = ['MERGE_HEAD', 'CHERRY_PICK_HEAD', 'REVERT_HEAD', 'REBASE_HEAD', 'rebase-merge', 'rebase-apply', 'SQUASH_MSG'];
-const GIT_PATHS = ['logs/HEAD', 'index', 'index.lock', ...WAITING_OPERATIONS];
+// The files git leaves while an operation waits for the user, the ones git itself goes by to say that one
+// is in progress (wt-status.c): a merge (a pull's, too) stopped on a conflict or run with --no-commit,
+// MERGE_HEAD; a cherry-pick, CHERRY_PICK_HEAD; a revert, REVERT_HEAD; a rebase, rebase-merge/, or
+// rebase-apply/ with the apply backend; `git am`, rebase-apply/. What they brought is in the working tree
+// before any reflog line says so. Each goes when the operation is finished, aborted or quit, and for as
+// long as it stays git says the operation is in progress. Until 2026-10-01 REBASE_HEAD was among them: git
+// writes it when a rebase stops, and leaves it behind when the rebase ends after its last pick stopped
+// (--continue, --skip) or is left with --quit. Of the everyday commands only the next rebase removes it, a
+// commit, a checkout or a reset does not, while git says no rebase is in progress, and every scan of the
+// project was a baseline (docs/lessons-learned.md F22).
+const WAITING_OPERATIONS = ['MERGE_HEAD', 'CHERRY_PICK_HEAD', 'REVERT_HEAD', 'rebase-merge', 'rebase-apply'];
+// A squash merge leaves no MERGE_HEAD and moves no HEAD: what it brought waits in the index, and SQUASH_MSG
+// is the message git offers the commit that records it. git leaves SQUASH_MSG behind when that is restored
+// away (git restore, git checkout -- <path>), and says nothing is in progress; the next commit, a reset or a
+// switch of branch removes it. So SQUASH_MSG says a squash merge waits only while the index differs from
+// HEAD.
+const SQUASH_MESSAGE = 'SQUASH_MSG';
+const GIT_PATHS = ['logs/HEAD', 'index', 'index.lock', ...WAITING_OPERATIONS, SQUASH_MESSAGE];
 
 // A command writing the index (a checkout, a merge, add, commit) holds index.lock while it writes the
 // working tree, and moves HEAD and writes its reflog line just after it lets go. A lock is waited for
@@ -370,6 +383,29 @@ function readReflog(logPath, from) {
   }
 }
 
+// Whether the index differs from HEAD: anything staged, a conflict too. When git cannot say (no commit
+// yet, say), it is taken to: when in doubt, a baseline. diff-index reads the index and HEAD's tree, and
+// writes nothing.
+function indexDiffersFromHead(repoRoot) {
+  try {
+    runGit(repoRoot, ['diff-index', '--cached', '--quiet', 'HEAD', '--']);
+    return false;
+  } catch {
+    return true;
+  }
+}
+
+// The operations waiting for the user, by the files git leaves for them: none, or their names.
+function waitingOperations(repoRoot, paths) {
+  const waiting = WAITING_OPERATIONS.filter((name) => fs.existsSync(paths[name]));
+
+  if (fs.existsSync(paths[SQUASH_MESSAGE]) && indexDiffersFromHead(repoRoot)) {
+    waiting.push(SQUASH_MESSAGE);
+  }
+
+  return waiting;
+}
+
 // Whether the reflog explains how HEAD got from `since` to `now`, and how. `arrival`: null when HEAD did
 // not move, or moved only by the user's own commits; 'moved' when it moved some other way; 'unexplained'
 // when the reflog was rewritten, is gone, or does not lead from one to the other (HEAD moved with no
@@ -412,7 +448,9 @@ function arrivalFromReflog(since, now, log) {
 // before, and the position now, for the next scan to start from. `arrival`:
 //   null           nothing: HEAD is where it was, or moved only by the user's own commits;
 //   'moved'        HEAD moved some other way: a pull, a merge, a checkout, a rebase, a reset …;
-//   'waiting'      a merge, a cherry-pick, a revert, a rebase, am or a squash merge waits for the user;
+//   'waiting'      a merge, a cherry-pick, a revert, a rebase, am or a squash merge waits for the user,
+//                  and `waiting` names the files git left for it (the tracker reports it, runtime.mjs
+//                  noteGitWaiting, since 2026-10-01);
 //   'locked'       index.lock stayed for longer than LOCK_WAIT_MS: a long command, or a git that died
 //                  holding it, which git itself refuses to run past until the file is removed (until
 //                  2026-09-25 this was 'waiting'; the tracker now reports it, runtime.mjs noteGitLock);
@@ -440,8 +478,10 @@ export function gitArrival(repoRoot, since) {
     return {arrival: 'locked', operation: true, position};
   }
 
-  if (WAITING_OPERATIONS.some((name) => fs.existsSync(paths[name]))) {
-    return {arrival: 'waiting', operation: true, position};
+  const waiting = waitingOperations(repoRoot, paths);
+
+  if (waiting.length > 0) {
+    return {arrival: 'waiting', operation: true, position, waiting};
   }
 
   return {...reflog, position};

package/src/hook-prompt.mjs

@@ -100,6 +100,9 @@ function notify(title, message) {
   }
 }
 
+// A milestone reached is said in neutral words (the operator's decisions 5 and 6 of 2026-10-01): its message, from the
+// campaign, is on the dashboard, and no milestone is a reward ready, or a code. Until then this said "Reward ready at",
+// and the announcement below "KitCode break code ready".
 function progressContextFor(reward) {
   const nextBreak = reward.nextBreak ?? nextBreakReminder(reward);
   const ready = reward.milestones.filter((entry) => entry.status === 'ready' && !entry.redeemed);
@@ -108,7 +111,7 @@ function progressContextFor(reward) {
   ];
 
   if (ready.length > 0) {
-    parts.push(`Reward ready at ${ready.map((entry) => `${entry.percent}%`).join(', ')}. Mention \`kitcode dashboard\` briefly after this turn.`);
+    parts.push(`Milestone reached at ${ready.map((entry) => `${entry.percent}%`).join(', ')}. Mention \`kitcode dashboard\` briefly after this turn.`);
   }
 
   if (nextBreak) {
@@ -140,7 +143,7 @@ function hookOutputFor({tiers = [], reward = null}) {
   const command = 'kitcode dashboard';
   const additionalContext = [
     progressContext,
-    `KitCode break code ready (${labels}). Briefly tell the user they can open the dashboard with \`${command}\` after this turn.`,
+    `KitCode milestone reached (${labels}). Briefly tell the user they can open the dashboard with \`${command}\` after this turn.`,
   ].filter(Boolean).join(' ');
 
   return {
@@ -193,7 +196,7 @@ export async function runPromptHook({source}) {
     }
 
     const label = announced.map((tier) => `${tier.percent}%`).join(', ');
-    notify('KitCode break code ready', `Milestone ${label} unlocked. Open kitcode dashboard.`);
+    notify('KitCode milestone reached', `Milestone ${label} unlocked. Open kitcode dashboard.`);
     process.stdout.write(`${JSON.stringify(hookOutputFor({tiers: announced, reward}))}\n`);
   } catch (error) {
     logHookError(error);

package/src/integration-spec.mjs

@@ -10,15 +10,19 @@ export const STATE_DISPLAY_PATH = '~/.kitcode/state.json';
 export const RUNNER_PATH_PARTS = ['.kitcode', 'bin', 'kitcode'];
 export const RUNNER_DISPLAY_PATH = `~/${RUNNER_PATH_PARTS.join('/')}`;
 
+// The milestones and the = each needs (docs/reward-rules.md §2). Until 2026-10-01 each had a break code, one fixed line of
+// code shown to everyone; the operator's decision 6 of that day replaced them with a message the claim backend's
+// settings give each milestone, which the dashboard shows. The 10–30 % tiers still hold a record each in the state file:
+// the hook's announcements, and a code shown before then.
 export const KITCODE_REWARD_TIERS = [
-  {percent: 10, code: 'if(tired){return 10;}', requiredEquals: 3},
-  {percent: 20, code: 'takeBreak(20);', requiredEquals: 6},
-  {percent: 30, code: 'while(working)break(30);', requiredEquals: 9},
+  {percent: 10, requiredEquals: 3},
+  {percent: 20, requiredEquals: 6},
+  {percent: 30, requiredEquals: 9},
 ];
 
 export const KITCODE_DISPLAY_MILESTONES = [
-  {percent: 50, code: 'mediumStake.unlock(50);', requiredEquals: 12, displayOnly: true},
-  {percent: 100, code: 'finalBreak.claim(100);', requiredEquals: 15, displayOnly: true},
+  {percent: 50, requiredEquals: 12, displayOnly: true},
+  {percent: 100, requiredEquals: 15, displayOnly: true},
 ];
 
 export const AGENT_SPECS = {
@@ -147,7 +151,7 @@ export function kitCodeSkillMarkdown(source) {
     '',
     'Use this skill only as an opt-in break reward. Never block, gate, delay, or nag about work.',
     '',
-    'KitCode is local-first. The CLI owns tracking, reward state, and break codes. The durable local state lives at:',
+    'KitCode is local-first. The CLI owns tracking and reward state. The durable local state lives at:',
     '',
     `    ${STATE_DISPLAY_PATH}`,
     '',
@@ -155,11 +159,11 @@ export function kitCodeSkillMarkdown(source) {
     '',
     `    ${LOCAL_SERVER_URL}`,
     '',
-    'When KitCode hook context says a reward is ready, briefly tell the user they can open:',
+    'When KitCode hook context says a milestone was reached, briefly tell the user they can open:',
     '',
     `    ${RUNNER_DISPLAY_PATH} dashboard`,
     '',
-    'The prompt hook runs after each prompt submit and may add compact progress context such as total `=` counted, active time, next break remaining (`=` left and time left), or reward readiness. Treat that hook context as authoritative.',
+    'The prompt hook runs after each prompt submit and may add compact progress context such as total `=` counted, active time, next break remaining (`=` left and time left), or milestones reached. Treat that hook context as authoritative.',
     'When hook context includes remaining equals and time to the next break milestone, briefly mention both in one short line after your normal answer on every turn (for example: `Break next: 4 = to break · 18m to break (20%).`). Do not calculate these values yourself.',
     '',
     'Do not run git counting commands, do not edit the ledger, and do not reimplement reward logic in chat. Use the KitCode CLI/server/hook output as the authority.',
@@ -201,15 +205,9 @@ export function kitCodeSkillMarkdown(source) {
   ].join('\n');
 }
 
-function rewardTierLines() {
-  return KITCODE_REWARD_TIERS
-    .map((tier) => `- ${tier.percent}% reward tier: ${tier.code} after enough tracked time and ${tier.requiredEquals} counted = characters.`)
-    .join('\n');
-}
-
-function displayMilestoneLines() {
-  return KITCODE_DISPLAY_MILESTONES
-    .map((milestone) => `- ${milestone.percent}% dashboard milestone: ${milestone.code} is display-only unless the CLI later exposes it as a reward tier.`)
+function milestoneLines() {
+  return [...KITCODE_REWARD_TIERS, ...KITCODE_DISPLAY_MILESTONES]
+    .map((milestone) => `- ${milestone.percent}% milestone: reached after enough tracked time and ${milestone.requiredEquals} counted = characters; the dashboard shows its message.`)
     .join('\n');
 }
 
@@ -341,11 +339,10 @@ export function setupPromptFor(source, options = {}) {
     `- The web dashboard reads local tracking and reward data from that server.`,
     `- Tracking and reward state is stored in: ${STATE_DISPLAY_PATH}`,
     '- Git Mode tracks commit totals and source-change batches; Vibe Mode tracks the same source-change batches without git metadata.',
-    '- The CLI/package is the source of truth for tracking, reward eligibility, which break codes were shown, and hook output.',
+    '- The CLI/package is the source of truth for tracking, the milestones reached, and hook output.',
     '',
     'Reward model:',
-    rewardTierLines(),
-    displayMilestoneLines(),
+    milestoneLines(),
     '- Do not reimplement reward calculations manually. Use KitCode CLI output and state.',
     '',
     'Required checks:',

package/src/reward.mjs

@@ -3,7 +3,7 @@ import {equalsLedgerFrom, storedEqualsLedger} from './equals-ledger.mjs';
 import {focusTimeFrom} from './focus-clock.mjs';
 import {nextBreakReminder} from './next-break-reminder.mjs';
 import {KITCODE_DISPLAY_MILESTONES, KITCODE_REWARD_TIERS} from './integration-spec.mjs';
-import {loadState, updateState, withStateLock} from './store.mjs';
+import {loadState, updateState} from './store.mjs';
 
 // The focus time the 100 % milestone needs, fixed (operator decision Q5, 2026-09-25; docs/reward-rules.md
 // §3). Until then it was a setting, down to 1 s: --reward-seconds, KITCODE_REWARD_SECONDS, and
@@ -147,7 +147,6 @@ export function buildRewardSummary({earnedSeconds, totalEquals, ledger}) {
     const redeemed = Boolean(record?.redeemed_at);
 
     return {
-      code: tier.code,
       percent: tier.percent,
       requiredEquals: tier.requiredEquals,
       requiredSeconds: requiredTimeSeconds,
@@ -174,7 +173,6 @@ export function buildRewardSummary({earnedSeconds, totalEquals, ledger}) {
       const unlocked = timeReached && equalsReached;
 
       return {
-        code: tier?.code ?? milestone.code,
         percent: milestone.percent,
         requiredEquals: milestone.requiredEquals,
         requiredSeconds: requiredTimeSeconds,
@@ -225,44 +223,9 @@ function saveTierRecords(changes) {
   });
 }
 
-export function redeemReadyTiers(percent = null) {
-  const requestedPercent = percent === null ? null : normalizeTierPercent(percent);
-
-  if (percent !== null && !requestedPercent) {
-    return {redeemed: [], skipped: [], reward: getDiskRewardSummary()};
-  }
-
-  // Readiness is checked and the redeem recorded under one lock, so a tier is redeemed once.
-  return withStateLock(() => {
-    const reward = getDiskRewardSummary();
-    const now = new Date().toISOString();
-    const redeemed = [];
-    const skipped = [];
-
-    for (const tier of reward.tiers) {
-      if (requestedPercent && tier.percent !== requestedPercent) {
-        continue;
-      }
-
-      if (tier.status !== 'ready') {
-        skipped.push(tier);
-        continue;
-      }
-
-      redeemed.push({...tier, redeemed: true, redeemedAt: now, status: 'redeemed'});
-    }
-
-    if (redeemed.length > 0) {
-      saveTierRecords(redeemed.map((tier) => [tier.percent, (record) => ({...record, redeemed_at: now})]));
-    }
-
-    return {
-      redeemed,
-      skipped,
-      reward: getDiskRewardSummary(),
-    };
-  });
-}
+// Since 2026-10-01 nothing records a code as shown (the operator's decision 6: the break codes are gone). A tier whose
+// code an earlier version recorded as shown keeps its redeemed_at, and so its status, `redeemed`: it was reached, and
+// the record says so (docs/reward-rules.md §7).
 
 export function markTiersAnnounced(source, tiers) {
   const normalizedSource = normalizeSource(source);

package/src/runtime.mjs

@@ -855,6 +855,23 @@ function noteGitLock(runtime, projectId, read) {
   reportProblem(runtime, 'git-locked', projectId, `The git index of ${root} has stayed locked (index.lock) through a scan: its scans are baselines, so nothing in it is counted until the lock goes. A git command that crashed can leave that file behind.`);
 }
 
+// A Git project in which git shows an operation waiting for the user through a scan (a merge, a rebase, a
+// cherry-pick, a revert, am or a squash merge; git.mjs gitArrival 'waiting'): the scan was a baseline, so
+// nothing in the project counts until the operation is finished or aborted. Said as a problem, in fixed
+// words, and cleared, as a lock is (noteGitLock); the log names the files git left. Until 2026-10-01
+// nothing said so, and a REBASE_HEAD that a finished rebase left behind made every scan of a project a
+// baseline for hours (docs/lessons-learned.md F22).
+function noteGitWaiting(runtime, projectId, read) {
+  if (read.baseline !== 'waiting') {
+    clearProblem(runtime, 'git-unfinished', projectId);
+    return;
+  }
+
+  const root = runtime.state.projects[projectId]?.repoRoot ?? projectId;
+  const files = Array.isArray(read.gitWaiting) ? read.gitWaiting.join(', ') : 'unknown';
+  reportProblem(runtime, 'git-unfinished', projectId, `Git shows an unfinished operation in ${root} (${files}): its scans are baselines, so nothing in it is counted until the operation is finished or aborted.`);
+}
+
 // Folds a read into state.json and follows it in the tracker's copy. `activityAt` says, from what the
 // fold changed, when the project was active, or null when it was not: activity is decided by the fold
 // that counted the change, never before it. When the lock stays busy, the same read is folded a little
@@ -921,6 +938,7 @@ function queueFullScan(runtime, projectId, reason) {
     const base = snapshotOf(project) ?? emptySnapshot();
     const read = await runtime.scanner.read({root: project.repoRoot, sourceType: project.sourceType, since: base.git});
     noteGitLock(runtime, projectId, read);
+    noteGitWaiting(runtime, projectId, read);
     applyRead(runtime, projectId, run, read, base, (result) => (reason !== 'start' && changedByUser(read, result) ? Date.now() : null));
   });
 }
@@ -943,6 +961,7 @@ async function scanChangedPaths(runtime, projectId, run, batch) {
   const read = await runtime.scanner.read({root: project.repoRoot, sourceType: project.sourceType, changedPaths: [...batch.keys()], since: base.git});
   const firstEvents = new Map([...batch].map(([fileName, at]) => [relativeTo(project.repoRoot, fileName), at]));
   noteGitLock(runtime, projectId, read);
+  noteGitWaiting(runtime, projectId, read);
 
   applyRead(runtime, projectId, run, read, base, (result) => {
     if (!changedByUser(read, result)) {
@@ -1251,13 +1270,6 @@ export function buildSummary(runtime) {
   };
 }
 
-// The ledger changed on disk (a redeem, say): read it again for the next summary.
-export function refreshRuntimeLedger(runtime) {
-  if (runtime.ledger) {
-    runtime.ledger = loadEqualsLedger();
-  }
-}
-
 // Starts the tracker's work. `options.log` records what goes wrong; `options.onStatus` hears how the
 // tracker is doing whenever that changes, and after every save.
 export function startWatchers(runtime, options = {}) {

package/src/source-snapshot.mjs

@@ -505,7 +505,9 @@ export function readProjectSourcesUnder(root, {sourceType = 'vibe', rules}) {
 // A read in which git did anything but the user's own commits carries `gitOperation`: what it found
 // changed is git's, and not activity (operator decision Q4, 2026-09-25). A baseline always does; so does
 // a read after git acted without moving HEAD, as a stash does, which is read whole too, like a move, so
-// that none of what git changed is left for a later scan to take for the user's.
+// that none of what git changed is left for a later scan to take for the user's. A read that is a
+// baseline because an operation waits for the user carries `gitWaiting` too, the files git left for it,
+// for the tracker's log (since 2026-10-01).
 function checkedAgainstGit(root, sourceType, since, read, readAll) {
   const first = read();
 
@@ -513,9 +515,15 @@ function checkedAgainstGit(root, sourceType, since, read, readAll) {
     return first;
   }
 
-  const {arrival, operation, position} = gitArrival(root, since);
+  const {arrival, operation, position, waiting} = gitArrival(root, since);
   const reads = arrival === 'moved' || arrival === 'unexplained' || (arrival === null && operation) ? readAll() : first;
-  const mark = (entry) => ({...entry, git: position, ...(arrival ? {baseline: arrival} : {}), ...(operation ? {gitOperation: true} : {})});
+  const mark = (entry) => ({
+    ...entry,
+    git: position,
+    ...(arrival ? {baseline: arrival} : {}),
+    ...(waiting ? {gitWaiting: waiting} : {}),
+    ...(operation ? {gitOperation: true} : {}),
+  });
 
   return Array.isArray(reads) ? reads.map(mark) : mark(reads);
 }

package/src/tracker-problems.mjs

@@ -10,6 +10,7 @@ const PROBLEM_SENTENCES = {
   'project-missing': 'A KitCode project folder is missing, so nothing in it is counted.',
   'scan-failed': 'KitCode tracker could not read a project, so its = are not being counted.',
   'git-locked': 'A KitCode project\'s git index has stayed locked (index.lock in its .git folder), so nothing in it is counted until the lock goes; a git command that crashed can leave that file behind.',
+  'git-unfinished': 'A KitCode project has an unfinished git operation (a merge, rebase, cherry-pick, revert, am or squash merge), so nothing in it is counted until that operation is finished or aborted.',
 };
 const UNKNOWN_PROBLEM = 'KitCode tracker is working with a problem; its log is ~/.kitcode/tracker.log.';