@hasna/economy 0.3.10 → 0.3.15

package/dist/mcp/index.js

@@ -1145,6 +1145,21 @@ function querySummary(db, period, machine, allMachines = false, agent) {
     period
   };
 }
+function queryZeroCostTokenizedModels(db, limit = 10) {
+  return db.prepare(`
+    SELECT agent,
+           model,
+           COUNT(*) as requests,
+           COALESCE(SUM(input_tokens + output_tokens + cache_read_tokens + cache_create_tokens), 0) as total_tokens,
+           MAX(timestamp) as last_seen
+    FROM requests
+    WHERE cost_usd = 0
+      AND (input_tokens > 0 OR output_tokens > 0 OR cache_read_tokens > 0 OR cache_create_tokens > 0)
+    GROUP BY agent, model
+    ORDER BY requests DESC, total_tokens DESC
+    LIMIT ?
+  `).all(limit);
+}
 function queryModelBreakdown(db) {
   return db.prepare(`
     SELECT model, agent,
@@ -3873,11 +3888,11 @@ async function syncAll(db, opts = {}) {
   const all = !anySpecific;
   const result = { deduped: 0 };
   if (all || opts.claude) {
-    result.claude = await ingestClaude(db, opts.verbose);
+    result.claude = await ingestClaude(db, opts.verbose, opts.projectsDir);
     result.claudeQuota = await ingestClaudeQuota(db, opts.verbose);
   }
   if (all || opts.takumi)
-    result.takumi = await ingestTakumi(db, opts.verbose);
+    result.takumi = await ingestTakumi(db, opts.verbose, opts.projectsDir);
   if (all || opts.codex) {
     result.codex = await ingestCodex(db, opts.verbose);
     result.codexQuota = await ingestCodexQuota(db, opts.verbose);
@@ -3899,6 +3914,156 @@ async function syncAll(db, opts = {}) {
   return result;
 }
 
+// src/lib/cloud-ingest.ts
+init_database();
+init_pricing();
+import { join as join10 } from "path";
+
+// src/ingest/billing.ts
+init_database();
+
+// src/lib/sync-maintenance.ts
+init_database();
+function backfillMachineId(db) {
+  const machine = getMachineId();
+  const reqCount = db.prepare(`UPDATE requests SET machine_id = ? WHERE machine_id = '' OR machine_id IS NULL`).run(machine);
+  const sessCount = db.prepare(`UPDATE sessions SET machine_id = ? WHERE machine_id = '' OR machine_id IS NULL`).run(machine);
+  return { requests: Number(reqCount.changes), sessions: Number(sessCount.changes) };
+}
+async function recalculateZeroCostRequests(db) {
+  const { computeCostFromDb: computeCostFromDb2 } = await Promise.resolve().then(() => (init_pricing(), exports_pricing));
+  const zeroRows = db.prepare(`SELECT id, model, input_tokens, output_tokens, cache_read_tokens, cache_create_tokens, cache_create_5m_tokens, cache_create_1h_tokens
+     FROM requests
+     WHERE cost_usd = 0
+       AND (input_tokens > 0 OR output_tokens > 0 OR cache_read_tokens > 0 OR cache_create_tokens > 0)`).all();
+  let fixed = 0;
+  for (const r of zeroRows) {
+    const cache5m = r.cache_create_5m_tokens ?? r.cache_create_tokens;
+    const cost = computeCostFromDb2(db, r.model, r.input_tokens, r.output_tokens, r.cache_read_tokens, cache5m, r.cache_create_1h_tokens ?? 0);
+    if (cost > 0) {
+      db.prepare(`UPDATE requests SET cost_usd = ? WHERE id = ?`).run(cost, r.id);
+      fixed++;
+    }
+  }
+  if (fixed > 0) {
+    const touchedSessions = new Set(zeroRows.map((r) => {
+      const row = db.prepare(`SELECT session_id FROM requests WHERE id = ?`).get(r.id);
+      return row?.session_id;
+    }).filter(Boolean));
+    for (const sid of touchedSessions)
+      rollupSession(db, sid);
+  }
+  return { fixed, total: zeroRows.length, buckets: queryZeroCostTokenizedModels(db, 8) };
+}
+
+// src/lib/cloud-ingest.ts
+var CLOUD_INGEST_TABLES = ["requests", "sessions", "billing_daily", "usage_snapshots", "subscriptions"];
+function getIngestCachePath() {
+  if (process.env["HASNA_ECONOMY_INGEST_CACHE"])
+    return process.env["HASNA_ECONOMY_INGEST_CACHE"];
+  return join10(getDataDir(), "ingest-cache.db");
+}
+function copyIngestState(from, to) {
+  const rows = from.prepare(`SELECT source, key, value FROM ingest_state`).all();
+  to.prepare(`DELETE FROM ingest_state`).run();
+  const insert = to.prepare(`INSERT INTO ingest_state (source, key, value) VALUES (?, ?, ?)`);
+  for (const row of rows)
+    insert.run(row.source, row.key, row.value);
+}
+function exportIngestRows(db) {
+  const body = {};
+  for (const table of CLOUD_INGEST_TABLES) {
+    const rows = db.prepare(`SELECT * FROM ${table}`).all();
+    if (rows.length > 0)
+      body[table] = rows;
+  }
+  return body;
+}
+function unwrapEnvelope(raw) {
+  if (raw && typeof raw === "object" && "data" in raw) {
+    const data = raw.data;
+    return data && typeof data === "object" ? data : {};
+  }
+  return raw ?? {};
+}
+async function postIngest(cloud, body) {
+  const raw = await cloud.client.transport.post("/ingest", body);
+  const payload = unwrapEnvelope(raw);
+  return {
+    ingested: payload["ingested"] ?? {},
+    total: Number(payload["total"] ?? 0)
+  };
+}
+async function syncAllToCloud(cloud, opts = {}) {
+  const scratch = openDatabase(":memory:", true);
+  ensurePricingSeeded(scratch);
+  const cache = openDatabase(opts.cachePath ?? getIngestCachePath(), true);
+  try {
+    if (opts.force)
+      cache.prepare(`DELETE FROM ingest_state`).run();
+    copyIngestState(cache, scratch);
+    const result = await syncAll(scratch, opts);
+    if (opts.backfillMachine)
+      backfillMachineId(scratch);
+    if (opts.recalculate)
+      await recalculateZeroCostRequests(scratch);
+    const body = exportIngestRows(scratch);
+    if (Object.keys(body).length === 0) {
+      copyIngestState(scratch, cache);
+      return { ...result, posted: false };
+    }
+    const response = await postIngest(cloud, body);
+    copyIngestState(scratch, cache);
+    return { ...result, posted: true, ingested: response.ingested, total: response.total };
+  } finally {
+    try {
+      scratch.close();
+    } catch {}
+    try {
+      cache.close();
+    } catch {}
+  }
+}
+
+// src/lib/contracts-client/storage.ts
+import { resolveStorageClient } from "@hasna/contracts/client/storage";
+
+// src/lib/cloud-storage.ts
+var ECONOMY_APP = "economy";
+var cache;
+function resolveEconomyCloudStorage(env = process.env, overrides) {
+  const resolved = resolveStorageClient(ECONOMY_APP, env, overrides);
+  return resolved.transport === "http" ? { active: true, client: resolved.client } : { active: false, client: null };
+}
+function economyCloudStorage(env = process.env) {
+  if (cache === undefined)
+    cache = resolveEconomyCloudStorage(env);
+  return cache;
+}
+function cleanQuery(query) {
+  if (!query)
+    return;
+  const out = {};
+  for (const [k, v] of Object.entries(query)) {
+    if (v !== undefined && v !== null && v !== "")
+      out[k] = v;
+  }
+  return Object.keys(out).length > 0 ? out : undefined;
+}
+async function cloudListItems(storage, resource, query) {
+  const cleaned = cleanQuery(query);
+  const res = await storage.client.list(resource, cleaned ? { query: cleaned } : {});
+  return res.items;
+}
+async function cloudObject(storage, path, query) {
+  const cleaned = cleanQuery(query);
+  const raw = await storage.client.transport.get(path, cleaned ? { query: cleaned } : {});
+  if (raw && typeof raw === "object" && "data" in raw) {
+    return raw.data;
+  }
+  return raw;
+}
+
 // src/lib/agents.ts
 var AGENTS = [
   "claude",
@@ -4736,472 +4901,6 @@ function queryModelEfficiency(db) {
      FROM requests GROUP BY model ORDER BY cost DESC`).all();
 }
 
-// src/lib/contracts-client/mode.ts
-var DEPRECATED_STORAGE_MODE_ALIASES = ["remote", "hybrid", "self_hosted"];
-function normalizeStorageMode(value) {
-  const normalized = value.trim().toLowerCase().replace(/-/g, "_");
-  if (normalized === "local")
-    return { mode: "local", deprecatedAlias: null };
-  if (normalized === "cloud")
-    return { mode: "cloud", deprecatedAlias: null };
-  if (DEPRECATED_STORAGE_MODE_ALIASES.includes(normalized)) {
-    return { mode: "cloud", deprecatedAlias: normalized };
-  }
-  throw new Error(`Unknown storage mode: ${value}. Use local or cloud.`);
-}
-function envToken(name) {
-  return name.toUpperCase().replace(/-/g, "_");
-}
-
-// src/lib/contracts-client/transport.ts
-function defaultCloudBaseUrl(name) {
-  return `https://${name}.hasna.xyz`;
-}
-function clientTransportEnvKeys(name) {
-  const token = envToken(name);
-  return {
-    modeKeys: [
-      `HASNA_${token}_STORAGE_MODE`,
-      `HASNA_${token}_MODE`,
-      `${token}_STORAGE_MODE`,
-      `${token}_MODE`
-    ],
-    apiUrlKeys: [`HASNA_${token}_API_URL`, `${token}_API_URL`],
-    apiKeyKeys: [`HASNA_${token}_API_KEY`, `${token}_API_KEY`]
-  };
-}
-function firstEnv(env, keys) {
-  for (const key of keys) {
-    const value = env[key]?.trim();
-    if (value)
-      return { key, value };
-  }
-  return null;
-}
-function toV1BaseUrl(apiUrl) {
-  const url = new URL(apiUrl);
-  if (url.protocol !== "http:" && url.protocol !== "https:") {
-    throw new Error("API URL must use http or https.");
-  }
-  let path = url.pathname.replace(/\/+$/, "");
-  if (path.endsWith("/v1"))
-    path = path.slice(0, -"/v1".length);
-  url.pathname = `${path}/v1`;
-  url.search = "";
-  url.hash = "";
-  return url.toString().replace(/\/+$/, "");
-}
-function resolveClientTransport(name, env = process.env) {
-  const keys = clientTransportEnvKeys(name);
-  const modeHit = firstEnv(env, keys.modeKeys);
-  const urlHit = firstEnv(env, keys.apiUrlKeys);
-  const keyHit = firstEnv(env, keys.apiKeyKeys);
-  let mode = "local";
-  let deprecatedAlias = null;
-  let modeSource = "default";
-  const warnings = [];
-  if (modeHit) {
-    const normalized = normalizeStorageMode(modeHit.value);
-    mode = normalized.mode;
-    deprecatedAlias = normalized.deprecatedAlias;
-    modeSource = modeHit.key;
-    if (deprecatedAlias) {
-      warnings.push(`Deprecated mode '${deprecatedAlias}' from ${modeHit.key} is treated as 'cloud'. Prefer ${keys.modeKeys[0]}=cloud.`);
-    }
-  } else if (urlHit && keyHit) {
-    mode = "cloud";
-    modeSource = `${urlHit.key}+${keyHit.key}`;
-  } else if (urlHit) {
-    warnings.push(`${urlHit.key} is set but no API key is present (${keys.apiKeyKeys[0]}). ` + `Refusing to fall back to the local store, which would silently serve a different dataset. ` + `Set ${keys.apiKeyKeys[0]} to enable the cloud client, or set ${keys.modeKeys[0]}=local ` + `to use the local store deliberately.`);
-    return {
-      transport: "local",
-      mode: "local",
-      deprecatedAlias,
-      modeSource: urlHit.key,
-      baseUrl: null,
-      apiUrlSource: null,
-      apiKeyPresent: false,
-      apiKeySource: null,
-      misconfigured: true,
-      warning: warnings.join(" ")
-    };
-  }
-  if (mode === "local") {
-    return {
-      transport: "local",
-      mode,
-      deprecatedAlias,
-      modeSource,
-      baseUrl: null,
-      apiUrlSource: null,
-      apiKeyPresent: Boolean(keyHit),
-      apiKeySource: keyHit ? keyHit.key : null,
-      misconfigured: false,
-      warning: warnings.length > 0 ? warnings.join(" ") : null
-    };
-  }
-  if (!keyHit) {
-    warnings.push(`${modeSource}=cloud but no API key is set (${keys.apiKeyKeys[0]}). Refusing to route to cloud; using local store. Set ${keys.apiKeyKeys[0]} to enable the cloud client.`);
-    return {
-      transport: "local",
-      mode,
-      deprecatedAlias,
-      modeSource,
-      baseUrl: null,
-      apiUrlSource: null,
-      apiKeyPresent: false,
-      apiKeySource: null,
-      misconfigured: true,
-      warning: warnings.join(" ")
-    };
-  }
-  const rawUrl = urlHit?.value ?? defaultCloudBaseUrl(name);
-  const apiUrlSource = urlHit ? urlHit.key : "default";
-  let baseUrl;
-  try {
-    baseUrl = toV1BaseUrl(rawUrl);
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    warnings.push(`Invalid API URL from ${apiUrlSource}: ${message}. Using local store.`);
-    return {
-      transport: "local",
-      mode,
-      deprecatedAlias,
-      modeSource,
-      baseUrl: null,
-      apiUrlSource: null,
-      apiKeyPresent: true,
-      apiKeySource: keyHit.key,
-      misconfigured: true,
-      warning: warnings.join(" ")
-    };
-  }
-  return {
-    transport: "cloud-http",
-    mode,
-    deprecatedAlias,
-    modeSource,
-    baseUrl,
-    apiUrlSource,
-    apiKeyPresent: true,
-    apiKeySource: keyHit.key,
-    misconfigured: false,
-    warning: warnings.length > 0 ? warnings.join(" ") : null
-  };
-}
-
-class HasnaHttpError extends Error {
-  status;
-  method;
-  path;
-  body;
-  constructor(method, path, status, body) {
-    super(`Hasna cloud request failed: ${method} ${path} -> ${status}`);
-    this.name = "HasnaHttpError";
-    this.status = status;
-    this.method = method;
-    this.path = path;
-    this.body = body;
-  }
-}
-var DEFAULT_RETRY_STATUSES = [408, 425, 429, 500, 502, 503, 504];
-var IDEMPOTENT_METHODS = new Set(["GET", "HEAD", "PUT", "DELETE", "OPTIONS"]);
-function appendQuery(path, query) {
-  if (!query)
-    return path;
-  const params = query instanceof URLSearchParams ? query : new URLSearchParams;
-  if (!(query instanceof URLSearchParams)) {
-    for (const [key, value] of Object.entries(query)) {
-      if (value === null || value === undefined)
-        continue;
-      if (Array.isArray(value)) {
-        for (const v of value)
-          params.append(key, String(v));
-      } else {
-        params.append(key, String(value));
-      }
-    }
-  }
-  const qs = params.toString();
-  if (!qs)
-    return path;
-  return `${path}${path.includes("?") ? "&" : "?"}${qs}`;
-}
-var defaultSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-function createHasnaHttpTransport(options) {
-  const fetchImpl = options.fetchImpl ?? ((input, init) => fetch(input, init));
-  const base = options.baseUrl.replace(/\/+$/, "");
-  const timeoutMs = options.timeoutMs ?? 30000;
-  const sleep = options.sleepImpl ?? defaultSleep;
-  const defaultRetry = options.retry;
-  function resolveRetry(callRetry) {
-    const chosen = callRetry !== undefined ? callRetry : defaultRetry;
-    if (chosen === false)
-      return null;
-    const r = chosen ?? {};
-    return {
-      retries: r.retries ?? 2,
-      baseDelayMs: r.baseDelayMs ?? 200,
-      maxDelayMs: r.maxDelayMs ?? 2000,
-      retryStatuses: r.retryStatuses ?? [...DEFAULT_RETRY_STATUSES]
-    };
-  }
-  async function once(method, rel, url, body, opts) {
-    const headers = {
-      "x-api-key": options.apiKey,
-      Authorization: `Bearer ${options.apiKey}`,
-      Accept: "application/json",
-      ...options.headers ?? {},
-      ...opts.headers ?? {}
-    };
-    if (opts.idempotencyKey)
-      headers["Idempotency-Key"] = opts.idempotencyKey;
-    const init = { method, headers };
-    if (body !== undefined) {
-      headers["Content-Type"] = "application/json";
-      init.body = JSON.stringify(body);
-    }
-    const controller = new AbortController;
-    const onAbort = () => controller.abort();
-    if (opts.signal) {
-      if (opts.signal.aborted)
-        controller.abort();
-      else
-        opts.signal.addEventListener("abort", onAbort, { once: true });
-    }
-    const timer = setTimeout(() => controller.abort(), opts.timeoutMs ?? timeoutMs);
-    init.signal = controller.signal;
-    let response;
-    try {
-      response = await fetchImpl(url, init);
-    } catch (error) {
-      const err = error instanceof Error ? error : new Error(String(error));
-      if (opts.signal?.aborted)
-        return { ok: false, retryable: false, error: err };
-      return { ok: false, retryable: true, error: err };
-    } finally {
-      clearTimeout(timer);
-      if (opts.signal)
-        opts.signal.removeEventListener("abort", onAbort);
-    }
-    const text = await response.text();
-    let parsed = undefined;
-    if (text.length > 0) {
-      try {
-        parsed = JSON.parse(text);
-      } catch {
-        parsed = text;
-      }
-    }
-    if (!response.ok) {
-      const retry = resolveRetry(opts.retry);
-      const retryable = retry ? retry.retryStatuses.includes(response.status) : false;
-      return { ok: false, retryable, error: new HasnaHttpError(method, rel, response.status, parsed) };
-    }
-    return { ok: true, value: parsed };
-  }
-  async function request(method, path, body, opts = {}) {
-    const upper = method.toUpperCase();
-    const rel = appendQuery(path.startsWith("/") ? path : `/${path}`, opts.query);
-    const url = `${base}${rel}`;
-    const retry = resolveRetry(opts.retry);
-    const methodRetryable = IDEMPOTENT_METHODS.has(upper) || Boolean(opts.idempotencyKey);
-    const maxAttempts = retry && methodRetryable ? retry.retries + 1 : 1;
-    let last = null;
-    for (let attempt = 1;attempt <= maxAttempts; attempt++) {
-      const result = await once(upper, rel, url, body, opts);
-      if (result.ok)
-        return result.value;
-      last = result;
-      const canRetry = retry !== null && methodRetryable && result.retryable && attempt < maxAttempts;
-      if (!canRetry)
-        break;
-      const backoff = Math.min(retry.maxDelayMs, retry.baseDelayMs * 2 ** (attempt - 1));
-      const jitter = Math.floor(Math.random() * (backoff / 2 + 1));
-      await sleep(backoff + jitter);
-    }
-    throw last.error;
-  }
-  return {
-    baseUrl: base,
-    request,
-    get: (path, opts) => request("GET", path, undefined, opts),
-    post: (path, body, opts) => request("POST", path, body, opts),
-    put: (path, body, opts) => request("PUT", path, body, opts),
-    patch: (path, body, opts) => request("PATCH", path, body, opts),
-    del: (path, body, opts) => request("DELETE", path, body, opts)
-  };
-}
-function createClientTransport(name, env = process.env, overrides) {
-  const resolution = resolveClientTransport(name, env);
-  if (resolution.misconfigured) {
-    throw new Error(resolution.warning ?? `Client for '${name}' is misconfigured for cloud mode.`);
-  }
-  if (resolution.transport === "local" || !resolution.baseUrl) {
-    return { transport: "local", client: null, resolution };
-  }
-  const keys = clientTransportEnvKeys(name);
-  const apiKey = firstEnv(env, keys.apiKeyKeys)?.value;
-  if (!apiKey) {
-    throw new Error(`Client for '${name}' resolved to cloud-http without an API key.`);
-  }
-  return {
-    transport: "cloud-http",
-    client: createHasnaHttpTransport({
-      name,
-      baseUrl: resolution.baseUrl,
-      apiKey,
-      ...overrides?.fetchImpl ? { fetchImpl: overrides.fetchImpl } : {},
-      ...overrides?.headers ? { headers: overrides.headers } : {},
-      ...overrides?.timeoutMs ? { timeoutMs: overrides.timeoutMs } : {},
-      ...overrides?.retry !== undefined ? { retry: overrides.retry } : {},
-      ...overrides?.sleepImpl ? { sleepImpl: overrides.sleepImpl } : {}
-    }),
-    resolution
-  };
-}
-
-// src/lib/contracts-client/storage.ts
-function resourcePath(resource) {
-  const trimmed = resource.replace(/^\/+|\/+$/g, "");
-  if (!trimmed)
-    throw new Error("resource must be a non-empty path segment");
-  return `/${trimmed}`;
-}
-function entityPath(resource, id) {
-  if (id === undefined || id === null || `${id}`.length === 0) {
-    throw new Error("id must be a non-empty string");
-  }
-  return `${resourcePath(resource)}/${encodeURIComponent(String(id))}`;
-}
-function newIdempotencyKey() {
-  const g = globalThis;
-  if (g.crypto?.randomUUID)
-    return g.crypto.randomUUID();
-  return `idmp_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 12)}`;
-}
-function extractItems(raw) {
-  if (Array.isArray(raw))
-    return raw;
-  if (raw && typeof raw === "object") {
-    const obj = raw;
-    for (const key of ["items", "data", "results", "rows", "records"]) {
-      if (Array.isArray(obj[key]))
-        return obj[key];
-    }
-  }
-  return [];
-}
-function extractTotal(raw) {
-  if (raw && typeof raw === "object") {
-    const obj = raw;
-    for (const key of ["total", "count", "totalCount", "total_count"]) {
-      if (typeof obj[key] === "number")
-        return obj[key];
-    }
-  }
-  return null;
-}
-function extractCursor(raw) {
-  if (raw && typeof raw === "object") {
-    const obj = raw;
-    for (const key of ["cursor", "nextCursor", "next_cursor", "next"]) {
-      if (typeof obj[key] === "string")
-        return obj[key];
-    }
-  }
-  return null;
-}
-function createHasnaStorageClient(name, transport) {
-  return {
-    name,
-    baseUrl: transport.baseUrl,
-    transport,
-    async list(resource, options = {}) {
-      const raw = await transport.get(resourcePath(resource), options);
-      return {
-        items: extractItems(raw),
-        total: extractTotal(raw),
-        cursor: extractCursor(raw),
-        raw
-      };
-    },
-    async get(resource, id, options = {}) {
-      try {
-        return await transport.get(entityPath(resource, id), options);
-      } catch (error) {
-        if (error instanceof HasnaHttpError && error.status === 404)
-          return null;
-        throw error;
-      }
-    },
-    async create(resource, body, options = {}) {
-      const { idempotencyKey, ...rest } = options;
-      return transport.post(resourcePath(resource), body, {
-        ...rest,
-        idempotencyKey: idempotencyKey ?? newIdempotencyKey()
-      });
-    },
-    async update(resource, id, patch, options = {}) {
-      const { method = "PATCH", idempotencyKey, ...rest } = options;
-      const call = method === "PUT" ? transport.put : transport.patch;
-      return call(entityPath(resource, id), patch, { ...rest, ...idempotencyKey ? { idempotencyKey } : {} });
-    },
-    async delete(resource, id, options = {}) {
-      try {
-        await transport.del(entityPath(resource, id), undefined, options);
-      } catch (error) {
-        if (error instanceof HasnaHttpError && error.status === 404)
-          return;
-        throw error;
-      }
-    }
-  };
-}
-function resolveStorageClient(name, env = process.env, overrides) {
-  const wired = createClientTransport(name, env, overrides);
-  if (wired.transport === "cloud-http") {
-    return { transport: "cloud-http", client: createHasnaStorageClient(name, wired.client) };
-  }
-  return { transport: "local", client: null };
-}
-
-// src/lib/cloud-storage.ts
-var ECONOMY_APP = "economy";
-var cache;
-function resolveEconomyCloudStorage(env = process.env, overrides) {
-  const resolved = resolveStorageClient(ECONOMY_APP, env, overrides);
-  return resolved.transport === "cloud-http" ? { active: true, client: resolved.client } : { active: false, client: null };
-}
-function economyCloudStorage(env = process.env) {
-  if (cache === undefined)
-    cache = resolveEconomyCloudStorage(env);
-  return cache;
-}
-function cleanQuery(query) {
-  if (!query)
-    return;
-  const out = {};
-  for (const [k, v] of Object.entries(query)) {
-    if (v !== undefined && v !== null && v !== "")
-      out[k] = v;
-  }
-  return Object.keys(out).length > 0 ? out : undefined;
-}
-async function cloudListItems(storage, resource, query) {
-  const cleaned = cleanQuery(query);
-  const res = await storage.client.list(resource, cleaned ? { query: cleaned } : {});
-  return res.items;
-}
-async function cloudObject(storage, path, query) {
-  const cleaned = cleanQuery(query);
-  const raw = await storage.client.transport.get(path, cleaned ? { query: cleaned } : {});
-  if (raw && typeof raw === "object" && "data" in raw) {
-    return raw.data;
-  }
-  return raw;
-}
-
 // src/lib/store/index.ts
 class LocalStore {
   transport = "local";
@@ -5995,11 +5694,35 @@ function buildServer() {
 `));
   });
   server.tool("sync", `Ingest new cost data. sources: ${SYNC_SOURCES.join("|")}. Set json=true for the full result object.`, { sources: z.enum([...SYNC_SOURCES]).optional(), json: z.boolean().optional() }, async ({ sources, json }) => {
-    if (isCloudStore()) {
-      return text("cloud mode: ingest is a local-only operation; nothing to sync (reads/writes route to the cloud API)");
-    }
     const selected = sources ?? "all";
     const opts = selected === "all" ? {} : { [selected]: true };
+    if (isCloudStore()) {
+      const cloud = economyCloudStorage();
+      if (!cloud.active) {
+        return text("cloud mode: sync transport unavailable (set HASNA_ECONOMY_API_URL and HASNA_ECONOMY_API_KEY)");
+      }
+      const result2 = await syncAllToCloud(cloud, opts);
+      if (json)
+        return text(JSON.stringify(result2, null, 2));
+      const lines2 = [`sync: ${selected}`];
+      if (result2.posted) {
+        const parts = Object.entries(result2.ingested ?? {}).filter(([, n]) => n > 0).map(([table, n]) => `${table}:${n}`);
+        lines2.push(`pushed: ${parts.join(", ")} (${result2.total} rows)`);
+      } else {
+        lines2.push("no new provider data to push (mtime cache current)");
+      }
+      lines2.push(`deduped: ${result2.deduped}`);
+      for (const [source, value] of Object.entries(result2)) {
+        if (source === "deduped" || source === "posted" || source === "ingested" || source === "total")
+          continue;
+        if (value == null)
+          continue;
+        lines2.push(`${source}: ${compactObject(value)}`);
+      }
+      lines2.push("Use json=true for the full sync result.");
+      return text(lines2.join(`
+`));
+    }
     const result = await syncAll(localDb(), opts);
     if (json)
       return text(JSON.stringify(result, null, 2));

package/dist/mcp/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,QAAQ,YAAY,CAAA;AACjC,eAAO,MAAM,qBAAqB,OAAO,CAAA;AAEzC,wBAAgB,WAAW,IAAI,GAAG,CAm0BjC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,QAAQ,YAAY,CAAA;AACjC,eAAO,MAAM,qBAAqB,OAAO,CAAA;AAEzC,wBAAgB,WAAW,IAAI,GAAG,CAw1BjC"}