npm - @basou/cli - Versions diffs - 0.5.0 → 0.6.0 - Mend

@basou/cli 0.5.0 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/program.js CHANGED Viewed

@@ -2632,6 +2632,9 @@ function formatSessionWork(session, events, now) {
   parts.push(`${w.commandCount} cmd / ${w.fileChangedCount} files / ${w.decisionCount} dec`);
   const activeBasis = w.activeTimeBasis === "engaged-turns" ? "turns" : "events";
   parts.push(`active ${formatDurationMs(w.activeTimeMs)} (${activeBasis})`);
+  if (w.availability.machineActive) {
+    parts.push(`machine ${formatDurationMs(w.machineActiveTimeMs)}`);
+  }
   parts.push(`span ${formatDurationMs(w.sessionSpanMs)}${w.open ? " (open)" : ""}`);
   parts.push(
     w.availability.commandTime ? `command ${formatDurationMs(w.commandTimeMs)}` : "command n/a (import)"
@@ -3059,6 +3062,12 @@ function printStatsText(result, bySource, byDay) {
       `  Summed:          ${formatDurationMs(t.activeTimeMs)}  (per-session sum; concurrent sessions double-counted)`
     );
   }
+  if (t.machineActiveAvailable) {
+    const machineSessions = result.sessions.filter((s) => s.availability.machineActive).length;
+    console.log(
+      `  Model working:   ${formatDurationMs(t.machineActiveTimeMs)}  (model compute, subset of active; Codex turn duration on ${machineSessions} of ${t.sessionCount} sessions; summed, not wall-clock-deduped)`
+    );
+  }
   const openPart = t.openSessionCount > 0 ? `; ${t.openSessionCount} open counted to now` : "";
   console.log(
     `  Span:            ${formatDurationMs(t.sessionSpanMs)}  (total elapsed${openPart})`
@@ -3078,8 +3087,9 @@ function printStatsText(result, bySource, byDay) {
     console.log("");
     console.log("By day (billable time x volume):");
     for (const d of result.byDay) {
+      const machine = d.machineActiveTimeMs > 0 ? ` (model ${formatDurationMs(d.machineActiveTimeMs)})` : "";
       console.log(
-        `  ${d.date}: ${formatDurationMs(d.billableActiveTimeMs)} active, ${formatInt(d.tokens.output)} out tok, ${d.commandCount} cmd / ${d.fileChangedCount} files / ${d.decisionCount} dec`
+        `  ${d.date}: ${formatDurationMs(d.billableActiveTimeMs)} active${machine}, ${formatInt(d.tokens.output)} out tok, ${d.commandCount} cmd / ${d.fileChangedCount} files / ${d.decisionCount} dec`
       );
     }
   }
@@ -3087,7 +3097,8 @@ function printStatsText(result, bySource, byDay) {
 function describeSource(s) {
   const cmd = s.commandTimeReliable ? formatDurationMs(s.commandTimeMs) : "n/a";
   const tokens = s.tokensAvailable ? `${formatInt(s.tokens.output)} out tok` : "no tokens";
-  return `${s.sessionCount} sessions, ${tokens}, active ${formatDurationMs(s.activeTimeMs)}, command ${cmd}`;
+  const machine = s.machineActiveAvailable ? `, model ${formatDurationMs(s.machineActiveTimeMs)}` : "";
+  return `${s.sessionCount} sessions, ${tokens}, active ${formatDurationMs(s.activeTimeMs)}${machine}, command ${cmd}`;
 }
 function formatInt(n) {
   return n.toLocaleString("en-US");
@@ -4620,6 +4631,10 @@ var VIEW_HTML = `<!doctype html>
       if (t.activeTimeMs !== t.billableActiveTimeMs) {
         timeRows.push(kvrow('summed', fmtDur(t.activeTimeMs) + '  (concurrent sessions double-counted)'));
       }
+      if (t.machineActiveAvailable) {
+        var machineSessions = sessions.filter(function (s) { return s.availability && s.availability.machineActive; }).length;
+        timeRows.push(kvrow('model working', fmtDur(t.machineActiveTimeMs) + '  (model compute, subset of active; Codex turn duration on ' + machineSessions + ' of ' + t.sessionCount + ' sessions; not wall-clock-deduped)'));
+      }
       timeRows.push(kvrow('span', fmtDur(t.sessionSpanMs) + (t.openSessionCount > 0 ? '  (' + t.openSessionCount + ' open)' : '')));
       timeRows.push(kvrow('command', fmtDur(t.commandTimeMs) + (t.commandTimeReliable ? '' : '  (some sessions report 0)')));
       detail.appendChild(el('table', { class: 'kv' }, [el('tbody', {}, timeRows)]));
@@ -4627,16 +4642,18 @@ var VIEW_HTML = `<!doctype html>
         detail.appendChild(el('h3', { text: 'By source' }));
         d.bySource.forEach(function (s) {
           var cmd = s.commandTimeReliable ? fmtDur(s.commandTimeMs) : 'n/a';
+          var machine = s.machineActiveAvailable ? ', model ' + fmtDur(s.machineActiveTimeMs) : '';
           detail.appendChild(el('div', { class: 'row' }, [
-            el('span', { text: s.sourceKind + ': ' + s.sessionCount + ' sessions, ' + numfmt(s.tokens.output) + ' out tok, active ' + fmtDur(s.activeTimeMs) + ', command ' + cmd })
+            el('span', { text: s.sourceKind + ': ' + s.sessionCount + ' sessions, ' + numfmt(s.tokens.output) + ' out tok, active ' + fmtDur(s.activeTimeMs) + machine + ', command ' + cmd })
           ]));
         });
       }
       if (d.byDay && d.byDay.length) {
         detail.appendChild(el('h3', { text: 'By day (billable time x volume)' }));
         d.byDay.forEach(function (day) {
+          var dayMachine = day.machineActiveTimeMs > 0 ? ' (model ' + fmtDur(day.machineActiveTimeMs) + ')' : '';
           detail.appendChild(el('div', { class: 'row' }, [
-            el('span', { text: day.date + ': ' + fmtDur(day.billableActiveTimeMs) + ' active, ' + numfmt(day.tokens.output) + ' out tok, ' + day.commandCount + ' cmd / ' + day.fileChangedCount + ' files / ' + day.decisionCount + ' dec' })
+            el('span', { text: day.date + ': ' + fmtDur(day.billableActiveTimeMs) + ' active' + dayMachine + ', ' + numfmt(day.tokens.output) + ' out tok, ' + day.commandCount + ' cmd / ' + day.fileChangedCount + ' files / ' + day.decisionCount + ' dec' })
           ]));
         });
       }