@dijkspicy/opencode-stats-reporter 0.1.2 → 0.1.4

package/contrib/opencode-session-reporter/README.md

@@ -65,7 +65,7 @@ config.json 不存在、JSON 非法、字段缺失或 URL 非法时一律静默
 {
   "schema_version": 1,
   "install_id": "0b3f7e6a-....",
-  "reporter": { "client": "opencode", "version": "0.1.2" },
+  "reporter": { "client": "opencode", "version": "0.1.4" },
   "sessions": [
     {
       "session_id": "ses_...",
@@ -79,13 +79,15 @@ config.json 不存在、JSON 非法、字段缺失或 URL 非法时一律静默
       "tokens_cache_write": 1320,
       "message_count": 12,
       "session_created_at": 1759000000000,
+      "session_title": "每30s自动刷新功能",
+      "session_directory": "/opt/projects/BlueRegionUsage",
       "last_activity_at": 1759003600123
     }
   ]
 }
 ```
 
-`model` 取该会话最后一条已完成助手消息的 `providerID/modelID`；`agent` 取其 `mode`（无则为 `null`）。载荷中**不存在** consumer/identity 类字段。
+`model` 取该会话最后一条已完成助手消息的 `providerID/modelID`；`agent` 取其 `mode`（无则为 `null`）。`session_title` / `session_directory` 取自**同一次** `session.get` 调用（不新增 API 请求），取不到时为 `null`（不是空字符串）。载荷中**不存在** consumer/identity 类字段。
 
 ## 测试
 

package/contrib/opencode-session-reporter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-session-reporter",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "private": true,
   "type": "module",
   "description": "opencode 客户端插件：在会话空闲时聚合各会话（含子代理会话）的 token 用量快照，经有界队列 + 指数退避非阻塞上报；载荷不含消费者身份字段。",

package/contrib/opencode-session-reporter/reporter.test.ts

@@ -77,12 +77,25 @@ const assistantMessage = (over: Partial<NonNullable<UsageMessage["info"]>> = {})
 const makeClient = (
   messages: Record<string, UsageMessage[]>,
   children: Record<string, string[]> = {},
+  /** session.get 的返回元数据；不传则 client 不含 session.get */
+  meta?: { created?: number | null; title?: string | null; directory?: string | null; throws?: boolean },
 ): ReporterClient => ({
   session: {
     messages: async (args: { path: { id: string } }) => ({ data: messages[args.path.id] ?? [] }),
     children: async (args: { path: { id: string } }) => ({
       data: (children[args.path.id] ?? []).map((id) => ({ id })),
     }),
+    ...(meta
+      ? {
+          get: meta.throws
+            ? async () => {
+                throw new Error("boom: session.get failed")
+              }
+            : async () => ({
+                data: { time: { created: meta.created ?? 1_700_000_000_000 }, title: meta.title ?? null, directory: meta.directory ?? null },
+              }),
+        }
+      : {}),
   },
 })
 
@@ -122,6 +135,8 @@ const snap = (sessionID: string, over: Partial<SessionSnapshot> = {}): SessionSn
     tokens_cache_write: 0,
     message_count: 1,
     session_created_at: null,
+    session_title: null,
+    session_directory: null,
     last_activity_at: 1_000 + snapSeq,
     ...over,
   }
@@ -136,7 +151,9 @@ const SESSION_KEYS = [
   "model",
   "revision",
   "session_created_at",
+  "session_directory",
   "session_id",
+  "session_title",
   "tokens_cache_read",
   "tokens_cache_write",
   "tokens_input",
@@ -481,6 +498,62 @@ await runTest("插件未设 SESSION_USAGE_ENDPOINT 时依然激活（返回 even
   }
 })
 
+await runTest("session.get 返回 title/directory → 快照与载荷带上，且复用同一次调用", async () => {
+  const client = makeClient(
+    { ses_meta: [assistantMessage()] },
+    {},
+    { created: 1_759_000_000_000, title: "每30s自动刷新功能", directory: "/opt/projects/BlueRegionUsage" },
+  )
+  let getCalls = 0
+  const origGet = client.session.get!
+  client.session.get = (async (args: { path: { id: string } }) => {
+    getCalls += 1
+    return origGet(args)
+  }) as typeof client.session.get
+
+  const { fetchFn, calls } = makeFetch("ok")
+  const { core } = makeCore(client, { endpoint: "http://e", fetchFn })
+  await core.collectSession("ses_meta")
+
+  const snapshot = core.queue.drainAll().find((s) => s.session_id === "ses_meta")
+  assert(!!snapshot, "应产出快照")
+  assertEqual(snapshot!.session_title, "每30s自动刷新功能", "快照 title")
+  assertEqual(snapshot!.session_directory, "/opt/projects/BlueRegionUsage", "快照 directory")
+  assertEqual(snapshot!.session_created_at, 1_759_000_000_000, "快照 created")
+  assertEqual(getCalls, 1, "单会话恰好一次 session.get（不新增 API 请求）")
+
+  // 载荷层面
+  const q = createQueue(50)
+  q.push(snapshot!)
+  const core2 = makeCore(makeClient({}), { endpoint: "http://e", queue: q, fetchFn }).core
+  await core2.flushOnce()
+  const body = JSON.parse(calls[0]!.init.body ?? "{}")
+  assertEqual(body.sessions[0].session_title, "每30s自动刷新功能", "载荷 title")
+  assertEqual(body.sessions[0].session_directory, "/opt/projects/BlueRegionUsage", "载荷 directory")
+})
+
+await runTest("session.get 抛错 → title/directory/created 为 null 而非崩溃", async () => {
+  const client = makeClient({ ses_err: [assistantMessage()] }, {}, { throws: true })
+  const { core } = makeCore(client, { endpoint: "http://e" })
+  await core.collectSession("ses_err")
+  const snapshot = core.queue.drainAll().find((s) => s.session_id === "ses_err")
+  assert(!!snapshot, "采集主流程不受影响，快照仍产生")
+  assertEqual(snapshot!.session_title, null, "title → null")
+  assertEqual(snapshot!.session_directory, null, "directory → null")
+  assertEqual(snapshot!.session_created_at, null, "created → null")
+})
+
+await runTest("session.get 不存在 → 三个元数据字段均为 null", async () => {
+  const client = makeClient({ ses_noget: [assistantMessage()] }) // 无 session.get
+  const { core } = makeCore(client, { endpoint: "http://e" })
+  await core.collectSession("ses_noget")
+  const snapshot = core.queue.drainAll().find((s) => s.session_id === "ses_noget")
+  assert(!!snapshot, "应产出快照")
+  assertEqual(snapshot!.session_title, null, "title → null")
+  assertEqual(snapshot!.session_directory, null, "directory → null")
+  assertEqual(snapshot!.session_created_at, null, "created → null")
+})
+
 // ---------------------------------------------------------------------------
 // 汇总
 // ---------------------------------------------------------------------------

package/contrib/opencode-session-reporter/session-usage-reporter.ts

@@ -43,7 +43,7 @@ import { dirname, join } from "node:path"
 // ---------------------------------------------------------------------------
 
 const SCHEMA_VERSION = 1
-const PLUGIN_VERSION = "0.1.2"
+const PLUGIN_VERSION = "0.1.4"
 /** 队列容量：最多积压 500 条会话快照，溢出丢最旧 */
 const QUEUE_CAP = 500
 /** 单次上报请求超时（AbortSignal.timeout） */
@@ -111,6 +111,8 @@ export type SessionSnapshot = {
   tokens_cache_write: number
   message_count: number
   session_created_at: number | null
+  session_title: string | null
+  session_directory: string | null
   last_activity_at: number | null
 }
 
@@ -256,6 +258,8 @@ const aggregateSessionImpl = (sessionID: string, messages: readonly UsageMessage
     tokens_cache_write: cacheWrite,
     message_count: count,
     session_created_at: null, // 由采集层补充
+    session_title: null, // 由采集层补充（session.get）
+    session_directory: null, // 由采集层补充（session.get）
     last_activity_at: lastActivity,
   }
 }
@@ -513,16 +517,29 @@ const createReporterCoreImpl = (options: ReporterCoreOptions): ReporterCore => {
     return ids
   }
 
-  const readSessionCreatedAt = async (sessionID: string): Promise<number | null> => {
+  const readSessionMeta = async (
+    sessionID: string,
+  ): Promise<{ created: number | null; title: string | null; directory: string | null }> => {
     try {
       const getSession = options.client.session.get
-      if (typeof getSession !== "function") return null
+      if (typeof getSession !== "function") return { created: null, title: null, directory: null }
       const response = await getSession.call(options.client.session, { path: { id: sessionID }, query: query() })
-      const created = (response as { data?: { time?: { created?: unknown } } | undefined } | undefined)?.data?.time
-        ?.created
-      return typeof created === "number" ? created : null
+      const data = (
+        response as
+          | { data?: { time?: { created?: unknown }; title?: unknown; directory?: unknown } }
+          | undefined
+      )?.data
+      const created = data?.time?.created
+      const title = data?.title
+      const directory = data?.directory
+      return {
+        created: typeof created === "number" ? created : null,
+        title: typeof title === "string" && title ? title : null,
+        directory: typeof directory === "string" && directory ? directory : null,
+      }
     } catch {
-      return null
+      // session.get 抛错 / 形状异常：元数据缺省为 null，绝不影响采集主流程
+      return { created: null, title: null, directory: null }
     }
   }
 
@@ -537,7 +554,11 @@ const createReporterCoreImpl = (options: ReporterCoreOptions): ReporterCore => {
     visited.add(sessionID)
     const snapshot = aggregateSessionImpl(sessionID, await readMessages(sessionID))
     if (snapshot) {
-      snapshot.session_created_at = await readSessionCreatedAt(sessionID)
+      // 复用同一次 session.get：created / title / directory 一并取得，不新增 API 请求
+      const meta = await readSessionMeta(sessionID)
+      snapshot.session_created_at = meta.created
+      snapshot.session_title = meta.title
+      snapshot.session_directory = meta.directory
       out.push(snapshot)
     }
     for (const childID of await readChildIDs(sessionID)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dijkspicy/opencode-stats-reporter",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "本地一体化 MaaS 用量看板：托管静态面板、反代用量接口、本地存储会话用量",
   "type": "module",
   "main": "./contrib/opencode-session-reporter/plugin-server.ts",

package/panel/css/style.css

@@ -527,22 +527,63 @@ body {
 #session-table tbody tr:hover { background: rgba(127,127,127,.06); }
 #session-table tbody tr:last-child td { border-bottom: none; }
 
-/* 会话 ID：等宽截断，完整值在 title，点击进详情 */
-.sess-id-btn {
+/* 会话首列：两行结构（主行标题 / 次行目录+ID），次要信息弱化不喧宾夺主 */
+.sess-title-line { min-width: 0; }
+.sess-title {
   display: inline-block;
+  max-width: 340px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  vertical-align: bottom;
+  font-weight: 600;
+  cursor: pointer;
+}
+.sess-title:hover { color: var(--accent-hover); text-decoration: underline; }
+.sess-sub-line {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  margin-top: 2px;
+  font-size: 11px;
+  color: var(--text-secondary);
+}
+.sess-sub-sep { flex: none; }
+.sess-dir {
   max-width: 200px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  font-size: 11px;
+  cursor: default;
+}
+@media (max-width: 767px) {
+  .sess-title { max-width: 180px; }
+  .sess-dir { max-width: 120px; }
+}
+
+/* 会话 ID：默认弱化（有标题时），等宽头尾截断，完整值在 title，点击进详情 */
+.sess-id-btn {
+  display: inline-block;
+  max-width: 130px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
   vertical-align: bottom;
   padding: 0;
   border: none;
   background: transparent;
-  color: var(--accent);
+  color: var(--text-secondary);
   font-family: Consolas, monospace;
-  font-size: 12px;
+  font-size: 11px;
   cursor: pointer;
 }
+/* 无标题时的降级主标识：恢复高亮，保证一眼可点 */
+.sess-id-btn.is-primary {
+  max-width: 200px;
+  color: var(--accent);
+  font-size: 12px;
+}
 .sess-id-btn:hover { color: var(--accent-hover); text-decoration: underline; }
 .sess-id-btn:focus-visible { outline: 1px solid var(--accent); }
 

package/panel/index.html

@@ -296,7 +296,7 @@
           <table id="session-table" class="session-table">
             <thead>
               <tr>
-                <th>会话</th>
+                <th title="优先显示会话标题，无标题时显示会话 ID；下方小字为会话所属项目目录，悬浮可看完整路径">会话</th>
                 <th>模型</th>
                 <th>代理</th>
                 <th class="num" title="输入总量 = 输入 + 缓存读 + 缓存写">输入总量</th>

package/panel/js/format.js

@@ -106,6 +106,15 @@
       ' ' + p(d.getHours()) + ':' + p(d.getMinutes()) + ':' + p(d.getSeconds());
   }
 
+  /** 毫秒时间戳 -> 'MM-DD HH:MM'（当年，会话列表"最后活动"列）；跨年回退完整格式，完整值另放 title */
+  function shortDateTime(ms) {
+    if (ms === null || ms === undefined || !isFinite(Number(ms))) return '--';
+    var d = new Date(Number(ms));
+    if (d.getFullYear() !== new Date().getFullYear()) return dateTime(ms);
+    function p(x) { return (x < 10 ? '0' : '') + x; }
+    return p(d.getMonth() + 1) + '-' + p(d.getDate()) + ' ' + p(d.getHours()) + ':' + p(d.getMinutes());
+  }
+
   /**
    * 环比变化（比值）：当前值与上一周期值比较，返回 { text, dir }
    * dir: 1 升 / -1 降 / 0 持平；基准为 0 或空值时返回 null（不展示）
@@ -149,6 +158,7 @@
     todayStr: todayStr,
     hourLabel: hourLabel,
     dateTime: dateTime,
+    shortDateTime: shortDateTime,
     pctChange: pctChange,
     ppChange: ppChange,
     maskKey: maskKey

package/panel/js/sessions.js

@@ -196,18 +196,84 @@
     st.rows.forEach(function (r) { tbody.appendChild(sessionRow(r)); });
   }
 
+  /** 空值守卫：非字符串或空白串返回 null，避免把 null/undefined/空串渲染到页面 */
+  function nonEmpty(v) {
+    return (typeof v === 'string' && v.trim()) ? v.trim() : null;
+  }
+
+  /** 会话 ID 头尾截断：ses_k2X9fjQ3mT…89xQ，头尾是最有辨识度的部分；完整值在 title 与详情 */
+  function shortId(id) {
+    return id.length > 20 ? id.slice(0, 14) + '…' + id.slice(-4) : id;
+  }
+
+  /** 目录压缩：取末两级，如 /opt/projects/BlueRegionUsage -> …/projects/BlueRegionUsage；完整路径放 title */
+  function shortDir(dir) {
+    var parts = String(dir).replace(/\\/g, '/').split('/').filter(function (s) { return s !== ''; });
+    if (!parts.length) return dir;
+    if (parts.length <= 2) return '/' + parts.join('/');
+    return '…/' + parts.slice(-2).join('/');
+  }
+
+  /** 会话 ID 按钮：等宽展示（头尾截断），完整值放 title，点击进详情；primary = 无标题时作为降级主标识 */
+  function idButton(sid, primary) {
+    var b = document.createElement('button');
+    b.type = 'button';
+    b.className = 'sess-id-btn mono' + (primary ? ' is-primary' : '');
+    b.textContent = shortId(sid);
+    b.title = sid + '\n点击查看详情';
+    b.addEventListener('click', function () { openDetail(sid); });
+    return b;
+  }
+
+  /**
+   * 首列「会话」：两行结构
+   *   主行：会话标题（加粗）；无标题时降级为会话 ID（等宽、高亮、可点）
+   *   次行：项目目录（末两级压缩，悬浮显全路径）· 会话 ID（弱化；ID 已作主标识时不重复）
+   */
   function sessionRow(r) {
     var tr = document.createElement('tr');
-    // 会话 ID：等宽截断展示，完整值放 title，点击查看详情
-    var sidTd = document.createElement('td');
-    var sidBtn = document.createElement('button');
-    sidBtn.type = 'button';
-    sidBtn.className = 'sess-id-btn mono';
-    sidBtn.textContent = r.session_id || '--';
-    sidBtn.title = (r.session_id || '') + '\n点击查看详情';
-    sidBtn.addEventListener('click', function () { openDetail(r.session_id); });
-    sidTd.appendChild(sidBtn);
-    tr.appendChild(sidTd);
+    var title = nonEmpty(r.session_title);
+    var dir = nonEmpty(r.session_directory);
+    var sid = nonEmpty(r.session_id) || '--';
+
+    var cell = document.createElement('td');
+    cell.className = 'sess-cell';
+
+    var line1 = document.createElement('div');
+    line1.className = 'sess-title-line';
+    if (title) {
+      var t = document.createElement('span');
+      t.className = 'sess-title';
+      t.textContent = title;
+      t.title = title + '\n点击查看详情';
+      t.addEventListener('click', function () { openDetail(sid); });
+      line1.appendChild(t);
+    } else {
+      line1.appendChild(idButton(sid, true));
+    }
+    cell.appendChild(line1);
+
+    var line2 = document.createElement('div');
+    line2.className = 'sess-sub-line';
+    if (dir) {
+      var d = document.createElement('span');
+      d.className = 'sess-dir mono';
+      d.textContent = shortDir(dir);
+      d.title = '目录：' + dir;
+      line2.appendChild(d);
+    }
+    if (title) {
+      if (dir) {
+        var sep = document.createElement('span');
+        sep.className = 'sess-sub-sep';
+        sep.textContent = '·';
+        line2.appendChild(sep);
+      }
+      line2.appendChild(idButton(sid, false));
+    }
+    if (line2.childNodes.length) cell.appendChild(line2);
+
+    tr.appendChild(cell);
 
     tr.appendChild(td(r.model || '--'));
     tr.appendChild(td(r.agent || '--'));
@@ -217,7 +283,8 @@
     tr.appendChild(td(F.fullNumber(r.tokens_cache_read), 'num'));
     tr.appendChild(td(F.fullNumber(r.tokens_cache_write), 'num'));
     tr.appendChild(td(F.fullNumber(r.message_count), 'num'));
-    tr.appendChild(td(F.dateTime(r.last_activity_at)));
+    var lastFull = F.dateTime(r.last_activity_at);
+    tr.appendChild(td(F.shortDateTime(r.last_activity_at), null, lastFull === '--' ? '' : lastFull));
     return tr;
   }
 
@@ -312,6 +379,8 @@
     ]));
 
     body.appendChild(group('会话信息', [
+      item('会话标题', nonEmpty(d.session_title) || '--'),
+      item('项目目录', nonEmpty(d.session_directory) || '--', true),
       item('模型', d.model || '--'),
       item('代理', d.agent || '--'),
       item('安装标识', d.install_id || '--', true),

package/src/store.js

@@ -29,6 +29,8 @@ CREATE TABLE IF NOT EXISTS session_usage (
   client_reported_at    INTEGER,
   first_seen_at         INTEGER NOT NULL,
   last_reported_at      INTEGER NOT NULL,
+  session_title         TEXT,
+  session_directory     TEXT,
   PRIMARY KEY (consumer_id, install_id, session_id)
 );
 CREATE INDEX IF NOT EXISTS idx_su_consumer_activity ON session_usage(consumer_id, last_activity_at DESC);
@@ -89,6 +91,8 @@ export function sanitizeRecord(raw) {
     last_activity_at: int(raw.last_activity_at),
     client_reported_at: optInt(raw.client_reported_at),
     client_session_header: str(raw.client_session_header),
+    session_title: str(raw.session_title, 300),
+    session_directory: str(raw.session_directory, 512),
   }
 }
 
@@ -109,6 +113,23 @@ export class Store {
 
   migrate() {
     this.db.exec(SCHEMA)
+    this.ensureColumns()
+  }
+
+  /**
+   * 幂等迁移：为已存在的旧库补齐后增列。
+   * SCHEMA 只在表不存在时建表；旧库需用 PRAGMA table_info 检测缺列后 ALTER TABLE ADD COLUMN
+   * （可空 TEXT 列，不写默认值 → 旧行自动为 NULL，既有数据不受影响；重复调用安全）。
+   */
+  ensureColumns() {
+    const existing = new Set(
+      this.db.prepare("PRAGMA table_info(session_usage)").all().map((r) => r.name),
+    )
+    for (const [name, type] of [["session_title", "TEXT"], ["session_directory", "TEXT"]]) {
+      if (!existing.has(name)) {
+        this.db.exec(`ALTER TABLE session_usage ADD COLUMN ${name} ${type}`)
+      }
+    }
   }
 
   indexes() {
@@ -128,19 +149,22 @@ export class Store {
     let accepted = 0
     let skipped = 0
     const find = this.db.prepare(
-      "SELECT revision, last_activity_at FROM session_usage WHERE consumer_id=? AND install_id=? AND session_id=?",
+      "SELECT revision, last_activity_at, session_title, session_directory FROM session_usage WHERE consumer_id=? AND install_id=? AND session_id=?",
+    )
+    const backfill = this.db.prepare(
+      "UPDATE session_usage SET session_title=?, session_directory=?, last_reported_at=? WHERE consumer_id=? AND install_id=? AND session_id=?",
     )
     const insert = this.db.prepare(`INSERT INTO session_usage
       (consumer_id, install_id, session_id, source, schema_version, reporter_version, client_session_header,
        model, agent, tokens_input, tokens_output, tokens_reasoning, tokens_cache_read, tokens_cache_write,
        cost, message_count, revision, session_created_at, last_activity_at, client_reported_at,
-       first_seen_at, last_reported_at)
-      VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`)
+       first_seen_at, last_reported_at, session_title, session_directory)
+      VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`)
     const update = this.db.prepare(`UPDATE session_usage SET
       source=?, schema_version=?, reporter_version=?, client_session_header=?, model=?, agent=?,
       tokens_input=?, tokens_output=?, tokens_reasoning=?, tokens_cache_read=?, tokens_cache_write=?,
       cost=?, message_count=?, revision=?, session_created_at=?, last_activity_at=?, client_reported_at=?,
-      last_reported_at=?
+      last_reported_at=?, session_title=?, session_directory=?
       WHERE consumer_id=? AND install_id=? AND session_id=?`)
 
     for (const r of records) {
@@ -152,6 +176,7 @@ export class Store {
           consumerId, r.install_id, r.session_id, source, schemaVersion, reporterVersion, r.client_session_header,
           r.model, r.agent, r.tokens_input, r.tokens_output, r.tokens_reasoning, r.tokens_cache_read, r.tokens_cache_write,
           r.cost, r.message_count, r.revision, r.session_created_at, r.last_activity_at, r.client_reported_at, ts, ts,
+          r.session_title, r.session_directory,
         )
       } else if (r.revision > prev.revision || (r.revision === prev.revision && r.last_activity_at > prev.last_activity_at)) {
         status = "upserted"
@@ -159,14 +184,26 @@ export class Store {
           source, schemaVersion, reporterVersion, r.client_session_header, r.model, r.agent,
           r.tokens_input, r.tokens_output, r.tokens_reasoning, r.tokens_cache_read, r.tokens_cache_write,
           r.cost, r.message_count, r.revision, r.session_created_at, r.last_activity_at, r.client_reported_at, ts,
+          r.session_title, r.session_directory,
           consumerId, r.install_id, r.session_id,
         )
       } else if (r.revision === prev.revision && r.last_activity_at === prev.last_activity_at) {
-        status = "unchanged"
+        // 单调守卫内（revision 与活动时间均未推进）：仅当元数据变化时做「窄更新」回填，
+        // 只写 session_title / session_directory / last_reported_at，不触碰 token 类字段、
+        // revision、last_activity_at、source、reporter_version 等计量与守卫字段。
+        const metaChanged =
+          (r.session_title ?? null) !== (prev.session_title ?? null) ||
+          (r.session_directory ?? null) !== (prev.session_directory ?? null)
+        if (metaChanged) {
+          status = "backfilled"
+          backfill.run(r.session_title ?? null, r.session_directory ?? null, ts, consumerId, r.install_id, r.session_id)
+        } else {
+          status = "unchanged"
+        }
       } else {
         status = "stale"
       }
-      if (status === "upserted" || status === "unchanged") accepted += 1
+      if (status === "upserted" || status === "unchanged" || status === "backfilled") accepted += 1
       else skipped += 1
       results.push({ session_id: r.session_id, install_id: r.install_id, status })
     }