poe-code 3.0.40 → 3.0.41

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.
@@ -75,14 +75,18 @@ export function registerUsageCommand(program, container) {
75
75
  .find((p) => p.type === "timeZoneName")?.value ?? "local";
76
76
  const dateTitle = `Date [${tzAbbr}]`;
77
77
  const dateWidth = Math.max(16, dateTitle.length);
78
- const costTitle = "Cost (compute points)";
79
- const costWidth = Math.max(10, costTitle.length);
80
- const tableChrome = 10;
81
- const modelMaxWidth = widths.maxLine - dateWidth - costWidth - tableChrome;
78
+ const costTitle = "Cost";
79
+ const costWidth = 24;
80
+ const tokenWidth = 10;
81
+ const tableChrome = 22;
82
+ const modelMaxWidth = Math.max(20, widths.maxLine - dateWidth - costWidth - tokenWidth * 3 - tableChrome);
82
83
  const tableColumns = [
83
84
  { name: "Date", title: dateTitle, alignment: "left", maxLen: dateWidth },
84
85
  { name: "Model", title: "Model", alignment: "left", maxLen: modelMaxWidth },
85
- { name: "Cost", title: costTitle, alignment: "right", maxLen: costWidth }
86
+ { name: "Cost", title: costTitle, alignment: "right", maxLen: costWidth },
87
+ { name: "Input", title: "Input tkn", alignment: "right", maxLen: tokenWidth },
88
+ { name: "Output", title: "Output tkn", alignment: "right", maxLen: tokenWidth },
89
+ { name: "Cached", title: "Cached tkn", alignment: "right", maxLen: tokenWidth }
86
90
  ];
87
91
  const formatEntry = (entry) => {
88
92
  const date = new Date(entry.creation_time / 1000);
@@ -95,12 +99,26 @@ export function registerUsageCommand(program, container) {
95
99
  const modelName = entry.bot_name.length > modelMaxWidth
96
100
  ? entry.bot_name.slice(0, modelMaxWidth - 1) + "\u2026"
97
101
  : entry.bot_name;
102
+ const costText = `$${entry.cost_usd} (${entry.cost_points} points)`;
103
+ const bd = entry.cost_breakdown_in_points;
104
+ const parseTokens = (s) => {
105
+ if (!s)
106
+ return "-";
107
+ const start = s.indexOf("(");
108
+ const end = s.indexOf(" tokens");
109
+ if (start === -1 || end === -1)
110
+ return "-";
111
+ return s.slice(start + 1, end);
112
+ };
98
113
  return {
99
114
  Date: theme.muted(formatted),
100
115
  Model: theme.accent(modelName),
101
116
  Cost: entry.cost_points < 0
102
- ? theme.error(String(entry.cost_points))
103
- : theme.success(String(entry.cost_points))
117
+ ? theme.error(costText)
118
+ : theme.success(costText),
119
+ Input: theme.muted(parseTokens(bd?.Input)),
120
+ Output: theme.muted(parseTokens(bd?.Output)),
121
+ Cached: theme.muted(parseTokens(bd?.Cached))
104
122
  };
105
123
  };
106
124
  let totalFetched = 0;
@@ -1 +1 @@
1
- {"version":3,"file":"usage.js","sourceRoot":"","sources":["../../../src/cli/commands/usage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"usage.js","sourceRoot":"","sources":["../../../src/cli/commands/usage.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -17076,7 +17076,22 @@ function stdoutMatchesExpected(stdout, expected) {
17076
17076
  if (trimmed === expected) {
17077
17077
  return true;
17078
17078
  }
17079
- return stdout.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0).some((line) => line === expected);
17079
+ const lines = stdout.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
17080
+ if (lines.some((line) => line === expected)) {
17081
+ return true;
17082
+ }
17083
+ for (const line of lines) {
17084
+ if (line[0] !== "{") continue;
17085
+ try {
17086
+ const parsed = JSON.parse(line);
17087
+ if (parsed.type === "result" && parsed.result === expected) {
17088
+ return true;
17089
+ }
17090
+ } catch {
17091
+ continue;
17092
+ }
17093
+ }
17094
+ return false;
17080
17095
  }
17081
17096
  function createSpawnHealthCheck(agentId, options) {
17082
17097
  const prompt = `Output exactly: ${options.expectedOutput}`;
@@ -36048,14 +36063,18 @@ function registerUsageCommand(program, container) {
36048
36063
  const tzAbbr = Intl.DateTimeFormat("en-US", { timeZoneName: "short" }).formatToParts(/* @__PURE__ */ new Date()).find((p) => p.type === "timeZoneName")?.value ?? "local";
36049
36064
  const dateTitle = `Date [${tzAbbr}]`;
36050
36065
  const dateWidth = Math.max(16, dateTitle.length);
36051
- const costTitle = "Cost (compute points)";
36052
- const costWidth = Math.max(10, costTitle.length);
36053
- const tableChrome = 10;
36054
- const modelMaxWidth = widths.maxLine - dateWidth - costWidth - tableChrome;
36066
+ const costTitle = "Cost";
36067
+ const costWidth = 24;
36068
+ const tokenWidth = 10;
36069
+ const tableChrome = 22;
36070
+ const modelMaxWidth = Math.max(20, widths.maxLine - dateWidth - costWidth - tokenWidth * 3 - tableChrome);
36055
36071
  const tableColumns = [
36056
36072
  { name: "Date", title: dateTitle, alignment: "left", maxLen: dateWidth },
36057
36073
  { name: "Model", title: "Model", alignment: "left", maxLen: modelMaxWidth },
36058
- { name: "Cost", title: costTitle, alignment: "right", maxLen: costWidth }
36074
+ { name: "Cost", title: costTitle, alignment: "right", maxLen: costWidth },
36075
+ { name: "Input", title: "Input tkn", alignment: "right", maxLen: tokenWidth },
36076
+ { name: "Output", title: "Output tkn", alignment: "right", maxLen: tokenWidth },
36077
+ { name: "Cached", title: "Cached tkn", alignment: "right", maxLen: tokenWidth }
36059
36078
  ];
36060
36079
  const formatEntry = (entry) => {
36061
36080
  const date4 = new Date(entry.creation_time / 1e3);
@@ -36066,10 +36085,22 @@ function registerUsageCommand(program, container) {
36066
36085
  const minutes = String(date4.getMinutes()).padStart(2, "0");
36067
36086
  const formatted = `${year}-${month}-${day} ${hours}:${minutes}`;
36068
36087
  const modelName = entry.bot_name.length > modelMaxWidth ? entry.bot_name.slice(0, modelMaxWidth - 1) + "\u2026" : entry.bot_name;
36088
+ const costText = `$${entry.cost_usd} (${entry.cost_points} points)`;
36089
+ const bd = entry.cost_breakdown_in_points;
36090
+ const parseTokens = (s) => {
36091
+ if (!s) return "-";
36092
+ const start = s.indexOf("(");
36093
+ const end = s.indexOf(" tokens");
36094
+ if (start === -1 || end === -1) return "-";
36095
+ return s.slice(start + 1, end);
36096
+ };
36069
36097
  return {
36070
36098
  Date: theme.muted(formatted),
36071
36099
  Model: theme.accent(modelName),
36072
- Cost: entry.cost_points < 0 ? theme.error(String(entry.cost_points)) : theme.success(String(entry.cost_points))
36100
+ Cost: entry.cost_points < 0 ? theme.error(costText) : theme.success(costText),
36101
+ Input: theme.muted(parseTokens(bd?.Input)),
36102
+ Output: theme.muted(parseTokens(bd?.Output)),
36103
+ Cached: theme.muted(parseTokens(bd?.Cached))
36073
36104
  };
36074
36105
  };
36075
36106
  let totalFetched = 0;
@@ -36336,7 +36367,7 @@ function registerModelsCommand(program, container) {
36336
36367
  // package.json
36337
36368
  var package_default = {
36338
36369
  name: "poe-code",
36339
- version: "3.0.40",
36370
+ version: "3.0.41",
36340
36371
  description: "CLI tool to configure Poe API for developer workflows.",
36341
36372
  type: "module",
36342
36373
  workspaces: [