sprag-cli 3.63.0 → 3.65.0

package/src/statusline-data.js

@@ -10,6 +10,7 @@
 import { resolve } from 'node:path';
 import { modelFamily } from './savings-ledger.js';
 import { loadModelRules } from './model-rules.js';
+import { sessionCostAcross } from './claude-price.js';
 
 /** Longest family name shown before it is cut. Keeps an opaque gateway id from taking the line. */
 const FAMILY_MAX = 14;
@@ -32,12 +33,17 @@ const shortFamily = (name) => (name.length > FAMILY_MAX ? `${name.slice(0, FAMIL
  * is rather than folding it into a neighbour; the name is shortened here so an
  * ARN cannot flood the line.
  *
+ * `usd` is what the runs cost, each priced at its own model by the same path
+ * the session's own cost takes (a gateway session from the gateway's table),
+ * and `unpriced` counts the priced parts that had no rate and were left out.
+ *
  * @param {Array} sessions parseAllSessions result
- * @param {{ transcriptPath?: string|null, sessionId?: string|null }} [ids]
- * @returns {{ total: number, families: Array<{ family: string, runs: number }> }|null}
+ * @param {{ transcriptPath?: string|null, sessionId?: string|null, env?: object }} [ids]
+ *   `env` decides the pricing path, as in sessionCost
+ * @returns {{ total: number, families: Array<{ family: string, runs: number }>, usd: number, unpriced: number }|null}
  *   null when the session cannot be found or ran no subagents
  */
-export function sessionSubagentSummary(sessions, { transcriptPath = null, sessionId = null } = {}) {
+export function sessionSubagentSummary(sessions, { transcriptPath = null, sessionId = null, env = process.env } = {}) {
   if (!Array.isArray(sessions) || (!transcriptPath && !sessionId)) return null;
   let hit = null;
   if (transcriptPath) {
@@ -62,7 +68,10 @@ export function sessionSubagentSummary(sessions, { transcriptPath = null, sessio
   const families = [...byFamily.entries()]
     .map(([family, n]) => ({ family, runs: n }))
     .sort((a, b) => b.runs - a.runs || a.family.localeCompare(b.family));
-  return { total: runs.length, families };
+  // A run is a session-shaped record (totals, model, modelTotals when it
+  // switched model), so it is priced the way a session is.
+  const cost = sessionCostAcross(runs, { env });
+  return { total: runs.length, families, usd: cost.actual, unpriced: cost.unpriced };
 }
 
 /**

package/src/update-notice.js

@@ -0,0 +1,37 @@
+import { updateStatus, maybeSpawnUpdateCheck, readUpdateState, updateCheckDisabled, SESSION_START_CHECK_INTERVAL_MS } from './update-check.js';
+import { debug } from './debug.js';
+
+/** Shared by terminal renders; registry I/O stays in the detached checker. */
+export function readUpdateChip(version, { refresh = true, ...opts } = {}) {
+  try {
+    if (refresh) maybeSpawnUpdateCheck(version, opts);
+    const status = updateStatus(version, opts);
+    const checkedAt = updateCheckDisabled() ? null : (Number(readUpdateState().checkedAt) || null);
+    return { ...status, checkedAt };
+  } catch (e) {
+    debug('update-check:chip', e);
+    return null;
+  }
+}
+
+export function upgradeInstructions(agent = 'claude') {
+  return agent === 'codex'
+    ? ['npm i -g sprag-cli --ignore-scripts', 'sprag install --agent codex']
+    : ['sprag upgrade'];
+}
+
+/** The model must obtain consent; a hook never installs a package itself. */
+export function updateOffer(version, { agent = 'claude', lang = 'en', ...opts } = {}) {
+  const u = readUpdateChip(version, { intervalMs: SESSION_START_CHECK_INTERVAL_MS, ...opts });
+  if (!u?.available || u.dismissed) return null;
+  const ko = lang === 'ko';
+  return [
+    ko ? `[sprag update] 새 버전이 나와 있습니다: v${u.current} → ${u.latest}.`
+      : `[sprag update] A newer version is available: v${u.current} → ${u.latest}.`,
+    ...(u.highlights || []).slice(0, 3).map((note) => `  - ${note}`),
+    ko ? '사용자에게 변경 내용을 알리고 업그레이드할지 물어보십시오. 승낙한 경우에만 아래 명령을 실행하십시오.'
+      : 'Show the changes and ask the user whether to upgrade. Run these commands only if they agree; do not install without asking.',
+    ...upgradeInstructions(agent).map((command) => `  ${command}`),
+    `  sprag update-check --dismiss${agent === 'codex' ? ' --agent codex' : ''}`,
+  ].join('\n');
+}