@ai-adoption-score/ai-coding-usage 1.1.0 → 1.2.0

package/README.md

@@ -21,15 +21,19 @@ In short: connect, choose on the survey page, then share. Before the choice, onl
 2. **The add-on puts its hooks and the ping-back in place** and copies itself to `~/.ai-adoption-score`. Why: the
    survey gets the numbers after every session without anyone running a command again, and a hook can't run from
    npx's temporary folder. The ping-back carries no numbers; it lets the report tell "no AI use today" from "no signal".
-3. **It sends the names of the repositories used in the last 30 days, and nothing else.** Why: the person chooses on
+3. **It sends the names of the repositories used in the last 90 days, and nothing else.** Why: the person chooses on
    their survey page, and the page needs the names to list them. The choice isn't asked in the terminal, because the
    line usually runs inside Claude Code or Codex, where the add-on can't ask questions. The server keeps the list for
    an hour at most.
 4. **The person ticks what to share** on their survey page; everything is ticked to start with. When they press
    Share, the list is deleted, and with it the names they didn't tick.
-5. **Only then do numbers leave the Mac:** the last 30 days of what they ticked, then the new numbers after each
+5. **Only then do numbers leave the Mac:** the last 90 days of what they ticked, then the new numbers after each
    session. Before every sync the add-on asks what they chose and keeps everything else on the Mac; the server checks
-   the same rule again.
+   the same rule again. After that first sync, each sync reads the last 30 days only, where rows can still change.
+   Why 90: the survey's report can show three months. Claude Code deletes its own records after 30 days unless its
+   `cleanupPeriodDays` setting says otherwise, so the older days hold what is left of them; Codex keeps its records.
+   A Mac connected with an earlier version, which sent 30 days, sends the 60 before them once, after it updates
+   itself and the server says it takes 90.
 6. **It keeps itself up to date.** Once a day the ping-back asks npm for the latest version. A newer one is
    downloaded, checked against the checksum npm lists for it, started once to see that it runs on this Mac's Node, and
    put in place of the add-on's copy; the hooks, the ping-back and the settings stay as they are. Why: a fix or a new
@@ -41,7 +45,7 @@ In short: connect, choose on the survey page, then share. Before the choice, onl
 The person makes their choice on the survey page, so the survey's server keeps it and the add-on follows the server's
 answer. It still checks what it's told:
 
-- It reads 30 days back at most, whatever the server asks for.
+- It reads 90 days back at most, whatever the server asks for, and 30 when the server names no number.
 - It shares nothing when the choice isn't one of the two kinds the server keeps: what the person ticked, or
   `{ "all": true }` for links made before people could choose.
 - It sends the token over https only. Plain http works only for this Mac's own address (`localhost`), for testing.
@@ -49,8 +53,8 @@ answer. It still checks what it's told:
 ## Commands
 
 - `connect <code> [--server <url>]`: links this Mac to the survey with the code from the survey page and puts the
-  hooks and the ping-back in place. Then it sends the names of the repositories used in the last 30 days, and nothing
-  else, so the person can choose on their survey page which to share; a background wait shares the last 30 days of
+  hooks and the ping-back in place. Then it sends the names of the repositories used in the last 90 days, and nothing
+  else, so the person can choose on their survey page which to share; a background wait shares the last 90 days of
   those once they press Share. The server defaults to `https://app.ai-adoption-score.app`;
   `AI_ADOPTION_SCORE_SERVER` or `--server http://localhost:3000` point it at a local app; any other server has to be
   https. Run again on a Mac that is connected, it keeps that Mac's link on the same server (the survey page still

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-adoption-score/ai-coding-usage",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Shares how you use Claude Code and Codex with your company's AI Adoption Score survey. Never prompts, AI answers, code or file names.",
   "homepage": "https://ai-adoption-score.app/product/ai-coding-usage",
   "repository": {

package/src/checkin.mjs

@@ -2,7 +2,7 @@
 import { existsSync, readdirSync, statSync } from 'node:fs'
 import { join } from 'node:path'
 import { CLIENT_VERSION, post } from './api.mjs'
-import { isCurrentConfig, readConfig } from './config.mjs'
+import { isCurrentConfig, readConfig, takeHistoryDays } from './config.mjs'
 import { hookState, uninstallAll } from './install.mjs'
 import { log } from './log.mjs'
 import { paths } from './paths.mjs'
@@ -89,6 +89,8 @@ export async function runCheckIn(env = process.env) {
     updateState((current) => {
       current.lastCheckInAt = new Date().toISOString()
     }, env)
+    // A server that now takes more days back than these settings say: the next sync sends the days in between once.
+    if (status === 'active') takeHistoryDays(config, response.body, env)
     log(`check-in: ${response.status} ${status ?? ''} claude=${checkIn.claudeHook} codex=${checkIn.codexHook}`, env)
   } catch (error) {
     log(`check-in failed: ${error instanceof Error ? error.message : String(error)}`, env)

package/src/cli.mjs

@@ -10,7 +10,7 @@ import { DEFAULT_SERVER, readConfig, writeConfig } from './config.mjs'
 import { runHook } from './hook.mjs'
 import { hookState, installAll, uninstallAll } from './install.mjs'
 import { paths } from './paths.mjs'
-import { daysToRead, scanUsage } from './scan.mjs'
+import { MAX_HISTORY_DAYS, daysToRead, scanUsage } from './scan.mjs'
 import { timeByHour } from './rows.mjs'
 import { readState } from './state.mjs'
 import { describeChoice, repositoryList } from './choice.mjs'
@@ -28,15 +28,15 @@ Usage
   ai-coding-usage preview [--days 30] [--company github.com/acme] [--json]
 
   connect     Link this Mac to your survey with the code from your survey page. It adds a hook to Claude Code and
-              Codex and an automatic ping-back, and sends the names of the repositories you used in the last 30 days, so
-              you can choose on your survey page which to share. Then it shares the last 30 days of those, and after
+              Codex and an automatic ping-back, and sends the names of the repositories you used in the last 90 days, so
+              you can choose on your survey page which to share. Then it shares the last 90 days of those, and after
               that, after each session. Run it again to change your choice. Once a day the ping-back looks for a
               newer version of the add-on and puts it in place.
   status      Show which survey this Mac shares with, what you chose, its hooks, when it last shared, and its version.
   sync        Share now, instead of after the next session.
   disconnect  Stop sharing from this Mac: removes the hooks, the ping-back and the add-on's settings.
   preview     Count this Mac's last 30 days and show what would be shared. Nothing is sent.
-  --days      How many days back, 1 to 30.
+  --days      How many days back, 1 to 90.
   --company   An account whose repositories are your company's, to mark them. Repeat for more.
   --json      Print the exact rows instead of the summary.
 `
@@ -131,7 +131,7 @@ async function connect(args) {
     return fail(response.body?.error ?? `Couldn't connect: the server answered ${response.status}.`)
   }
   const { token, companyName, syncIntervalSeconds } = response.body
-  // However far back the survey asks for, the add-on reads 30 days at most.
+  // However far back the survey asks for, the add-on reads 90 days at most (config.mjs).
   const historyDays = daysToRead(response.body.historyDays)
   // A new connection starts with nothing sent.
   rmSync(paths().state, { force: true })
@@ -159,7 +159,7 @@ async function connect(args) {
   const found = list.repositories.length
   say(`Found ${found} ${found === 1 ? 'repository' : 'repositories'}${list.outsideGit ? ', and work outside a repository' : ''}, in the last ${historyDays} days.`)
   say('Now choose on your survey page which to share. Nothing from your sessions is sent until you do.')
-  say('Then the last 30 days of what you chose are shared, and after that, your numbers after each session.')
+  say(`Then the last ${historyDays} days of what you chose are shared, and after that, your numbers after each session.`)
   // Waits in the background, so this line returns at once in Claude Code or Codex too.
   const waiter = spawn(process.execPath, [paths().appBin, 'sync', '--background', '--wait-for-choice'], {
     detached: true,
@@ -259,7 +259,7 @@ async function preview(rest) {
     if (option === '--json') json = true
     else if (option === '--days') {
       days = Number(rest[++index])
-      if (!Number.isInteger(days) || days < 1 || days > 30) return fail('--days needs a whole number from 1 to 30.')
+      if (!Number.isInteger(days) || days < 1 || days > MAX_HISTORY_DAYS) return fail(`--days needs a whole number from 1 to ${MAX_HISTORY_DAYS}.`)
     } else if (option === '--company') {
       const account = rest[++index]
       if (!account) return fail('--company needs an account, like github.com/acme.')

package/src/config.mjs

@@ -7,12 +7,44 @@ import { join } from 'node:path'
  * The add-on's own folder, `~/.ai-adoption-score`: the connection's settings and its device token. Only the person's
  * own account can read it. `AI_ADOPTION_SCORE_HOME` points it elsewhere, for testing.
  *
+ * `historyDays` is how many days back the server takes, and `historyDaysSent` how many of them went out in one sync:
+ * fewer, and the next sync reads them all once (`sync.mjs`).
+ *
  * @typedef {{ server: string, token: string, companyName: string, connectedAt: string, syncIntervalSeconds: number,
- *   historyDays: number, lastSyncAt?: string, initialSyncDone?: boolean }} UsageConfig
+ *   historyDays: number, historyDaysSent?: number, lastSyncAt?: string, initialSyncDone?: boolean }} UsageConfig
  */
 
 export const DEFAULT_SERVER = 'https://app.ai-adoption-score.app'
 
+/** The add-on never reads further back than this, whatever the server asks for. */
+export const MAX_HISTORY_DAYS = 90
+/** What a server that names no number takes: every server before add-on 1.2 took 30 days. */
+const DEFAULT_HISTORY_DAYS = 30
+
+/** How many days to read: a whole number from 1 to 90, and 30 when `days` isn't one. @param {unknown} days */
+export function daysToRead(days) {
+  const whole = Math.trunc(Number(days))
+  return Number.isFinite(whole) && whole >= 1 ? Math.min(whole, MAX_HISTORY_DAYS) : DEFAULT_HISTORY_DAYS
+}
+
+/**
+ * A server's answer to a sync or a check-in that takes more days than this Mac's settings say (`historyDays`: 30 before,
+ * 90 since add-on 1.2): the settings take the new number, so the next sync sends the days in between once. Never fewer,
+ * so a Mac never sends a day its server would refuse. Returns the settings as they are now.
+ * @param {UsageConfig} config
+ * @param {unknown} answer
+ * @returns {UsageConfig}
+ */
+export function takeHistoryDays(config, answer, env = process.env) {
+  const named = answer && typeof answer === 'object' && 'historyDays' in answer ? answer.historyDays : undefined
+  if (named === undefined) return config
+  const offered = daysToRead(named)
+  if (offered <= (config.historyDays ?? 0) || !isCurrentConfig(config, env)) return config
+  const next = { ...(readConfig(env) ?? config), historyDays: offered }
+  writeConfig(next, env)
+  return next
+}
+
 export function configDir(env = process.env) {
   return env.AI_ADOPTION_SCORE_HOME || join(homedir(), '.ai-adoption-score')
 }

package/src/scan.mjs

@@ -4,22 +4,18 @@ import { readCodex } from './codex.mjs'
 import { loadDesktopConnectorNames } from './connectors.mjs'
 import { assignCommits, createGitInfo } from './git.mjs'
 import { createRowSet, finishRow, hasUse, windowStart } from './rows.mjs'
+import { daysToRead } from './config.mjs'
 
-/** The add-on never reads further back than this, whatever the server asks for. */
-export const MAX_HISTORY_DAYS = 30
-
-/** How many days to read: a whole number from 1 to 30, and 30 when `days` isn't one. @param {unknown} days */
-export function daysToRead(days) {
-  const whole = Math.trunc(Number(days))
-  return Number.isFinite(whole) && whole >= 1 ? Math.min(whole, MAX_HISTORY_DAYS) : MAX_HISTORY_DAYS
-}
+export { MAX_HISTORY_DAYS, daysToRead } from './config.mjs'
 
 /**
- * Reads this Mac's Claude Code and Codex records for the last `days` calendar days, 30 at most, and returns the rows
- * that would be sent, with how much of the records could be read. Nothing is written and nothing leaves the Mac.
+ * Reads this Mac's Claude Code and Codex records for the last `days` calendar days (30 unless asked, 90 at most) and
+ * returns the rows that would be sent, with how much of the records could be read. Nothing is written and nothing leaves
+ * the Mac. Claude Code deletes its own records after 30 days unless its `cleanupPeriodDays` says otherwise, so older days
+ * hold what is left of them; Codex keeps its records.
  * @param {{ days?: number, now?: number, env?: NodeJS.ProcessEnv }} [options]
  */
-export async function scanUsage({ days = MAX_HISTORY_DAYS, now = Date.now(), env = process.env } = {}) {
+export async function scanUsage({ days = 30, now = Date.now(), env = process.env } = {}) {
   const since = windowStart(now, daysToRead(days))
   const rows = createRowSet()
   const gitInfo = createGitInfo()

package/src/sync.mjs

@@ -5,7 +5,7 @@ import { constants, setPriority } from 'node:os'
 import { get, post, CLIENT_VERSION } from './api.mjs'
 import { reportedHookState } from './checkin.mjs'
 import { isShared, readChoice } from './choice.mjs'
-import { isCurrentConfig, writeConfig } from './config.mjs'
+import { isCurrentConfig, readConfig, takeHistoryDays, writeConfig } from './config.mjs'
 import { hookState, uninstallAll } from './install.mjs'
 import { log } from './log.mjs'
 import { paths } from './paths.mjs'
@@ -18,6 +18,12 @@ const MAX_ROWS = 400
 const MAX_BYTES = 200 * 1024
 /** A sync that started this long ago and still holds the lock has died. */
 const STALE_LOCK_MS = 15 * 60_000
+/**
+ * The days every sync reads once all the days the server takes went out: the rows that can still change (today's, a
+ * branch pushed later, a commit made after a session) are in them, and reading more would only take longer (about 20
+ * seconds for 30 days on a busy Mac).
+ */
+export const SYNC_DAYS = 30
 
 /** @param {import('./rows.mjs').UsageRow[]} rows */
 export function batches(rows) {
@@ -136,7 +142,11 @@ export async function syncNow(config, { background = false, reason = 'manual', e
     }
     const { choice } = asked
 
-    const scan = await scanUsage({ days: config.historyDays, env })
+    // All the days the server takes go out in one sync: the first one, and once more when the server comes to take
+    // more than before (90 instead of 30 since add-on 1.2). Every other sync reads the last 30 days.
+    const wholeWindow = (config.historyDaysSent ?? 0) < config.historyDays
+    const days = wholeWindow ? config.historyDays : Math.min(config.historyDays, SYNC_DAYS)
+    const scan = await scanUsage({ days, env })
     // Time by hour among the rows that go out only, so a session that stays on the Mac takes no share of it.
     const included = timeByHour(scan.rows.filter((row) => sendsTool(row.tool, config, state, env) && isShared(choice, row.repository)))
     const changed = included.filter((row) => state.sent[rowKey(row)] !== rowHash(row))
@@ -148,9 +158,12 @@ export async function syncNow(config, { background = false, reason = 'manual', e
     const groups = changed.length > 0 ? batches(changed) : [[]]
     let accepted = 0
     let status = asked.status === 'revoked' || asked.status === 'closed' ? asked.status : 'active'
+    /** @type {unknown} */
+    let answer = null
     for (const [index, rows] of status === 'active' ? groups.entries() : []) {
       const body = { schemaVersion: 1, clientVersion: CLIENT_VERSION, rows, ...(index === 0 ? { checkIn } : {}) }
       const response = await post(config.server, '/api/usage/sync', body, config.token)
+      answer = response.body
       status = response.body?.status ?? (response.status === 401 ? 'revoked' : 'error')
       if (response.status === 429 || status === 'paused') {
         const wait = (response.retryAfterSeconds ?? response.body?.nextSyncAfterSeconds ?? 600) * 1000
@@ -183,9 +196,19 @@ export async function syncNow(config, { background = false, reason = 'manual', e
       updateState((current) => {
         current.sent = Object.fromEntries(Object.entries(current.sent).filter(([key]) => keep.has(key)))
       }, env)
-      // The first sync is the one with the person's choice: it sends the last 30 days of every tool.
-      if (choice && !config.initialSyncDone && isCurrentConfig(config, env)) writeConfig({ ...config, initialSyncDone: true, lastSyncAt: new Date().toISOString() }, env)
-      log(`sync (${reason}): sent ${accepted} of ${included.length} rows`, env)
+      // The first sync is the one with the person's choice: it sends every tool's days. Once all the days the server takes
+      // went out, the next syncs read the last 30.
+      if (choice && (!config.initialSyncDone || wholeWindow) && isCurrentConfig(config, env)) {
+        const current = readConfig(env) ?? config
+        writeConfig({
+          ...current,
+          ...(config.initialSyncDone ? {} : { initialSyncDone: true, lastSyncAt: new Date().toISOString() }),
+          ...(wholeWindow ? { historyDaysSent: days } : {}),
+        }, env)
+      }
+      // A server that takes more days than these settings say: the next sync sends the days in between.
+      takeHistoryDays(config, answer, env)
+      log(`sync (${reason}): sent ${accepted} of ${included.length} rows${wholeWindow ? `, reading ${days} days` : ''}`, env)
     } else {
       log(`sync (${reason}): ${status}`, env)
     }
@@ -205,9 +228,9 @@ export async function syncNow(config, { background = false, reason = 'manual', e
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
 
 /**
- * Right after connecting, in the background: waits while the person chooses on their survey page, then sends the last
- * 30 days of what they chose. It gives up when the list on their page expires (an hour); the next sync after they
- * choose sends them all the same.
+ * Right after connecting, in the background: waits while the person chooses on their survey page, then sends the days
+ * the server takes (90) of what they chose. It gives up when the list on their page expires (an hour); the next sync
+ * after they choose sends them all the same.
  * @param {import('./config.mjs').UsageConfig} config
  * @param {{ env?: NodeJS.ProcessEnv, timeoutMs?: number }} [options]
  */