@hasna/economy 0.2.0 → 0.2.2

package/dist/cli/index.js

@@ -844,6 +844,11 @@ function ok(data, meta) {
 function err(message, status = 400) {
   return json({ error: message }, status);
 }
+function applyFields(obj, fields) {
+  if (!fields || fields.length === 0)
+    return obj;
+  return Object.fromEntries(fields.map((f) => [f, obj[f] ?? null]));
+}
 function createHandler(db) {
   return async function handler(req) {
     const url = new URL(req.url);
@@ -867,8 +872,10 @@ function createHandler(db) {
       const limit = Number(url.searchParams.get("limit") ?? 50);
       const offset = Number(url.searchParams.get("offset") ?? 0);
       const since = url.searchParams.get("since") ?? undefined;
+      const fieldsParam = url.searchParams.get("fields");
+      const fields = fieldsParam ? fieldsParam.split(",").map((f) => f.trim()).filter(Boolean) : undefined;
       const sessions = querySessions(db, { agent: agent ?? undefined, project, limit, offset, since });
-      return ok(sessions, { limit, offset });
+      return ok(fields ? sessions.map((s) => applyFields(s, fields)) : sessions, { limit, offset });
     }
     if (path === "/api/top" && method === "GET") {
       const n = Number(url.searchParams.get("n") ?? 10);
@@ -1166,7 +1173,7 @@ program.command("month").description("Cost summary for this month").action(async
   await autoSync();
   printSummary("This Month", "month");
 });
-program.command("sessions").description("List coding sessions with costs").option("--agent <agent>", "Filter by agent (claude|codex)").option("--project <path>", "Filter by project path").option("--limit <n>", "Number of sessions", "20").action(async (opts) => {
+program.command("sessions").description("List coding sessions with costs").option("--agent <agent>", "Filter by agent (claude|codex)").option("--project <path>", "Filter by project path").option("--limit <n>", "Number of sessions", "20").option("--format <fmt>", "Output format: table|compact|csv|json", "table").action(async (opts) => {
   await autoSync();
   const db = openDatabase();
   const sessions = querySessions(db, {
@@ -1175,7 +1182,24 @@ program.command("sessions").description("List coding sessions with costs").optio
     limit: Number(opts.limit ?? 20)
   });
   if (sessions.length === 0) {
-    console.log(chalk2.yellow("No sessions found. Run `economy sync` first."));
+    console.log(chalk2.yellow("No sessions found."));
+    return;
+  }
+  const f = opts.format ?? "table";
+  if (f === "compact") {
+    for (const s of sessions)
+      process.stdout.write(`${s.id.slice(0, 8)} ${s.agent} ${fmt2(s.total_cost_usd)} ${fmtTokens(s.total_tokens)} ${s.project_name || "\u2014"}
+`);
+    return;
+  }
+  if (f === "json") {
+    console.log(JSON.stringify(sessions, null, 2));
+    return;
+  }
+  if (f === "csv") {
+    console.log("id,agent,project_name,total_cost_usd,total_tokens,request_count,started_at");
+    for (const s of sessions)
+      console.log(`${s.id},${s.agent},"${s.project_name}",${s.total_cost_usd},${s.total_tokens},${s.request_count},${s.started_at}`);
     return;
   }
   console.log();

package/dist/mcp/index.js

@@ -391,7 +391,6 @@ var init_database = () => {};
 
 // src/mcp/index.ts
 init_database();
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 
@@ -596,80 +595,67 @@ async function ingestCodex(db, verbose = false) {
 init_pricing();
 var db = openDatabase();
 ensurePricingSeeded(db);
-var server = new Server({ name: "economy", version: "0.1.0" }, { capabilities: { tools: {} } });
+var fmtUsd = (n) => "$" + n.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+var fmtTok = (n) => n >= 1e9 ? `${(n / 1e9).toFixed(1)}B` : n >= 1e6 ? `${(n / 1e6).toFixed(1)}M` : n >= 1000 ? `${(n / 1000).toFixed(1)}k` : String(n);
+function fmtSession(s) {
+  const id = String(s["id"] ?? "").slice(0, 8);
+  const agent = String(s["agent"] ?? "");
+  const proj = String(s["project_name"] || s["project_path"] || "\u2014").slice(0, 20);
+  const cost = fmtUsd(Number(s["total_cost_usd"] ?? 0));
+  const tok = fmtTok(Number(s["total_tokens"] ?? 0));
+  return `${id} ${agent.padEnd(6)} ${cost.padEnd(10)} ${tok.padEnd(8)} ${proj}`;
+}
 var TOOLS = [
-  {
-    name: "get_cost_summary",
-    description: "Get total cost summary for a time period",
-    inputSchema: {
-      type: "object",
-      properties: {
-        period: { type: "string", enum: ["today", "week", "month", "all"], description: "Time period", default: "today" }
-      }
-    }
-  },
-  {
-    name: "get_sessions",
-    description: "List coding sessions with cost data",
-    inputSchema: {
-      type: "object",
-      properties: {
-        agent: { type: "string", enum: ["claude", "codex"], description: "Filter by agent" },
-        project: { type: "string", description: "Filter by project path (partial match)" },
-        limit: { type: "number", description: "Max results", default: 20 }
-      }
-    }
-  },
-  {
-    name: "get_top_sessions",
-    description: "Get the most expensive coding sessions",
-    inputSchema: {
-      type: "object",
-      properties: {
-        n: { type: "number", description: "Number of sessions to return", default: 10 },
-        agent: { type: "string", enum: ["claude", "codex"], description: "Filter by agent" }
-      }
-    }
-  },
-  {
-    name: "get_model_breakdown",
-    description: "Get cost breakdown by AI model",
-    inputSchema: { type: "object", properties: {} }
-  },
-  {
-    name: "get_project_breakdown",
-    description: "Get cost breakdown by project",
-    inputSchema: { type: "object", properties: {} }
-  },
-  {
-    name: "get_budget_status",
-    description: "Get current budget status and spending vs limits",
-    inputSchema: { type: "object", properties: {} }
-  },
-  {
-    name: "sync",
-    description: "Trigger cost data ingestion from Claude Code and/or Codex",
-    inputSchema: {
-      type: "object",
-      properties: {
-        sources: { type: "string", enum: ["all", "claude", "codex"], default: "all" }
-      }
-    }
-  }
+  { name: "get_cost_summary", description: "Cost summary (total_usd, sessions, requests, tokens, human summary). period: today|week|month|all", inputSchema: { type: "object", properties: { period: { type: "string", enum: ["today", "week", "month", "all"] } } } },
+  { name: "get_sessions", description: "List sessions. Returns compact table. Params: agent, project, limit(20)", inputSchema: { type: "object", properties: { agent: { type: "string" }, project: { type: "string" }, limit: { type: "number" } } } },
+  { name: "get_top_sessions", description: "Top sessions by cost. Params: n(10), agent", inputSchema: { type: "object", properties: { n: { type: "number" }, agent: { type: "string" } } } },
+  { name: "get_model_breakdown", description: "Cost per model. No params.", inputSchema: { type: "object", properties: {} } },
+  { name: "get_project_breakdown", description: "Cost per project. No params.", inputSchema: { type: "object", properties: {} } },
+  { name: "get_budget_status", description: "Budget limits vs spend, percent used, alert flags. No params.", inputSchema: { type: "object", properties: {} } },
+  { name: "sync", description: "Ingest new cost data. sources: all|claude|codex", inputSchema: { type: "object", properties: { sources: { type: "string", enum: ["all", "claude", "codex"] } } } },
+  { name: "search_tools", description: "List tool names matching query. Use first to find relevant tools.", inputSchema: { type: "object", properties: { query: { type: "string" } } } },
+  { name: "describe_tools", description: "Get param hints for specific tools by name.", inputSchema: { type: "object", properties: { names: { type: "array", items: { type: "string" } } }, required: ["names"] } }
 ];
+var TOOL_DESCRIPTIONS = {
+  get_cost_summary: "period(today|week|month|all) \u2192 {total_usd, sessions, requests, tokens, summary}",
+  get_sessions: "agent(claude|codex), project(partial), limit(20) \u2192 compact session table",
+  get_top_sessions: "n(10), agent(claude|codex) \u2192 top sessions by cost",
+  get_model_breakdown: "no params \u2192 model, requests, tokens, cost",
+  get_project_breakdown: "no params \u2192 project_name, sessions, cost",
+  get_budget_status: "no params \u2192 budget limits, current spend, percent_used, is_over_alert",
+  sync: "sources(all|claude|codex) \u2192 {files, requests, sessions} ingested"
+};
 server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools: TOOLS }));
 server.setRequestHandler(CallToolRequestSchema, async (req) => {
   const { name, arguments: args } = req.params;
   const a = args ?? {};
   try {
     switch (name) {
+      case "search_tools": {
+        const q = a["query"]?.toLowerCase();
+        const names = TOOLS.map((t) => t.name);
+        const matches = q ? names.filter((n) => n.includes(q)) : names;
+        return { content: [{ type: "text", text: matches.join(", ") }] };
+      }
+      case "describe_tools": {
+        const names = a["names"] ?? [];
+        const result = names.map((n) => `${n}: ${TOOL_DESCRIPTIONS[n] ?? "see tool schema"}`).join(`
+`);
+        return { content: [{ type: "text", text: result }] };
+      }
       case "get_cost_summary": {
         const period = a["period"] ?? "today";
-        const summary = querySummary(db, period);
-        const fmtUsd = (n) => "$" + n.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
-        const fmtTok = (n) => n >= 1e9 ? `${(n / 1e9).toFixed(1)}B` : n >= 1e6 ? `${(n / 1e6).toFixed(1)}M` : n >= 1000 ? `${(n / 1000).toFixed(1)}k` : String(n);
-        const result = { ...summary, summary: `You've spent ${fmtUsd(summary.total_usd)} ${period === "all" ? "total" : period} across ${summary.sessions} sessions (${summary.requests.toLocaleString()} requests, ${fmtTok(summary.tokens)} tokens)` };
-        return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
+        const s = querySummary(db, period);
+        const text = [
+          `period: ${period}`,
+          `cost: ${fmtUsd(s.total_usd)}`,
+          `sessions: ${s.sessions}`,
+          `requests: ${s.requests.toLocaleString()}`,
+          `tokens: ${fmtTok(s.tokens)}`,
+          `summary: You've spent ${fmtUsd(s.total_usd)} ${period === "all" ? "total" : period} across ${s.sessions} sessions (${s.requests.toLocaleString()} requests, ${fmtTok(s.tokens)} tokens)`
+        ].join(`
+`);
+        return { content: [{ type: "text", text }] };
       }
       case "get_sessions": {
         const sessions = querySessions(db, {
@@ -677,29 +663,65 @@ server.setRequestHandler(CallToolRequestSchema, async (req) => {
           project: a["project"],
           limit: Number(a["limit"] ?? 20)
         });
-        return { content: [{ type: "text", text: JSON.stringify(sessions, null, 2) }] };
+        const lines = ["id       agent  cost       tokens   project"];
+        for (const s of sessions)
+          lines.push(fmtSession(s));
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
       }
       case "get_top_sessions": {
         const sessions = queryTopSessions(db, Number(a["n"] ?? 10), a["agent"]);
-        return { content: [{ type: "text", text: JSON.stringify(sessions, null, 2) }] };
+        const lines = ["rank  id       agent  cost       tokens   project"];
+        sessions.forEach((s, i) => lines.push(`${String(i + 1).padEnd(5)} ${fmtSession(s)}`));
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
       }
       case "get_model_breakdown": {
-        return { content: [{ type: "text", text: JSON.stringify(queryModelBreakdown(db), null, 2) }] };
+        const rows = queryModelBreakdown(db);
+        const lines = ["model                          reqs    tokens   cost"];
+        for (const r of rows) {
+          lines.push(`${String(r["model"]).slice(0, 30).padEnd(31)}${String(r["requests"]).padEnd(8)}${fmtTok(Number(r["total_tokens"])).padEnd(9)}${fmtUsd(Number(r["cost_usd"]))}`);
+        }
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
       }
       case "get_project_breakdown": {
-        return { content: [{ type: "text", text: JSON.stringify(queryProjectBreakdown(db), null, 2) }] };
+        const rows = queryProjectBreakdown(db);
+        const lines = ["project              sessions tokens   cost"];
+        for (const r of rows) {
+          const name2 = String(r["project_name"] || r["project_path"] || "\u2014").slice(0, 20);
+          lines.push(`${name2.padEnd(21)}${String(r["sessions"]).padEnd(9)}${fmtTok(Number(r["total_tokens"])).padEnd(9)}${fmtUsd(Number(r["cost_usd"]))}`);
+        }
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
       }
       case "get_budget_status": {
-        return { content: [{ type: "text", text: JSON.stringify(getBudgetStatuses(db), null, 2) }] };
+        const budgets = getBudgetStatuses(db);
+        if (budgets.length === 0)
+          return { content: [{ type: "text", text: "No budgets set." }] };
+        const lines = ["scope                period   spent      limit      used%  status"];
+        for (const b of budgets) {
+          const scope = String(b["project_path"] ?? "global").slice(0, 20);
+          const pct = Number(b["percent_used"]).toFixed(1);
+          const status = b["is_over_limit"] ? "OVER" : b["is_over_alert"] ? "ALERT" : "OK";
+          lines.push(`${scope.padEnd(21)}${String(b["period"]).padEnd(9)}${fmtUsd(Number(b["current_spend_usd"])).padEnd(11)}${fmtUsd(Number(b["limit_usd"])).padEnd(11)}${pct}%`.padEnd(49) + `  ${status}`);
+        }
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
       }
       case "sync": {
         const sources = a["sources"] ?? "all";
-        const results = {};
-        if (sources === "all" || sources === "claude")
-          results["claude"] = await ingestClaude(db);
-        if (sources === "all" || sources === "codex")
-          results["codex"] = await ingestCodex(db);
-        return { content: [{ type: "text", text: JSON.stringify(results, null, 2) }] };
+        const parts = [];
+        if (sources === "all" || sources === "claude") {
+          const r = await ingestClaude(db);
+          parts.push(`claude: ${r["files"]} files, ${r["requests"]} requests, ${r["sessions"]} sessions`);
+        }
+        if (sources === "all" || sources === "codex") {
+          const r = await ingestCodex(db);
+          parts.push(`codex: ${r["sessions"]} sessions`);
+        }
+        return { content: [{ type: "text", text: parts.join(`
+`) || "done" }] };
       }
       default:
         return { content: [{ type: "text", text: `Unknown tool: ${name}` }], isError: true };

package/dist/server/index.js

@@ -646,6 +646,11 @@ function ok(data, meta) {
 function err(message, status = 400) {
   return json({ error: message }, status);
 }
+function applyFields(obj, fields) {
+  if (!fields || fields.length === 0)
+    return obj;
+  return Object.fromEntries(fields.map((f) => [f, obj[f] ?? null]));
+}
 function createHandler(db) {
   return async function handler(req) {
     const url = new URL(req.url);
@@ -669,8 +674,10 @@ function createHandler(db) {
       const limit = Number(url.searchParams.get("limit") ?? 50);
       const offset = Number(url.searchParams.get("offset") ?? 0);
       const since = url.searchParams.get("since") ?? undefined;
+      const fieldsParam = url.searchParams.get("fields");
+      const fields = fieldsParam ? fieldsParam.split(",").map((f) => f.trim()).filter(Boolean) : undefined;
       const sessions = querySessions(db, { agent: agent ?? undefined, project, limit, offset, since });
-      return ok(sessions, { limit, offset });
+      return ok(fields ? sessions.map((s) => applyFields(s, fields)) : sessions, { limit, offset });
     }
     if (path === "/api/top" && method === "GET") {
       const n = Number(url.searchParams.get("n") ?? 10);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/economy",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "AI coding cost tracker — CLI + MCP server + REST API + web dashboard for Claude Code, Codex, and Gemini",
   "type": "module",
   "main": "dist/index.js",
@@ -48,7 +48,7 @@
   "author": "hasna",
   "license": "Apache-2.0",
   "publishConfig": {
-    "access": "restricted",
+    "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {