@cookielab.io/oopst 0.1.0 → 0.3.0

package/dist/index.js

@@ -21,9 +21,9 @@ var __commonJS = (cb, mod) => function __require2() {
 };
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
-    for (let key5 of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key5) && key5 !== except)
-        __defProp(to, key5, { get: () => from[key5], enumerable: !(desc = __getOwnPropDesc(from, key5)) || desc.enumerable });
+    for (let key6 of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key6) && key6 !== except)
+        __defProp(to, key6, { get: () => from[key6], enumerable: !(desc = __getOwnPropDesc(from, key6)) || desc.enumerable });
   }
   return to;
 };
@@ -1061,9 +1061,9 @@ var require_option = __commonJS({
             this.positiveOptions.set(option.attributeName(), option);
           }
         });
-        this.negativeOptions.forEach((value, key5) => {
-          if (this.positiveOptions.has(key5)) {
-            this.dualOptions.add(key5);
+        this.negativeOptions.forEach((value, key6) => {
+          if (this.positiveOptions.has(key6)) {
+            this.dualOptions.add(key6);
           }
         });
       }
@@ -1998,11 +1998,11 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} key
        * @return {object} value
        */
-      getOptionValue(key5) {
+      getOptionValue(key6) {
         if (this._storeOptionsAsProperties) {
-          return this[key5];
+          return this[key6];
         }
-        return this._optionValues[key5];
+        return this._optionValues[key6];
       }
       /**
        * Store option value.
@@ -2011,8 +2011,8 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {object} value
        * @return {Command} `this` command for chaining
        */
-      setOptionValue(key5, value) {
-        return this.setOptionValueWithSource(key5, value, void 0);
+      setOptionValue(key6, value) {
+        return this.setOptionValueWithSource(key6, value, void 0);
       }
       /**
        * Store option value and where the value came from.
@@ -2022,13 +2022,13 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} source - expected values are default/config/env/cli/implied
        * @return {Command} `this` command for chaining
        */
-      setOptionValueWithSource(key5, value, source) {
+      setOptionValueWithSource(key6, value, source) {
         if (this._storeOptionsAsProperties) {
-          this[key5] = value;
+          this[key6] = value;
         } else {
-          this._optionValues[key5] = value;
+          this._optionValues[key6] = value;
         }
-        this._optionValueSources[key5] = source;
+        this._optionValueSources[key6] = source;
         return this;
       }
       /**
@@ -2038,8 +2038,8 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} key
        * @return {string}
        */
-      getOptionValueSource(key5) {
-        return this._optionValueSources[key5];
+      getOptionValueSource(key6) {
+        return this._optionValueSources[key6];
       }
       /**
        * Get source of option value. See also .optsWithGlobals().
@@ -2048,11 +2048,11 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} key
        * @return {string}
        */
-      getOptionValueSourceWithGlobals(key5) {
+      getOptionValueSourceWithGlobals(key6) {
         let source;
         this._getCommandAndAncestors().forEach((cmd) => {
-          if (cmd.getOptionValueSource(key5) !== void 0) {
-            source = cmd.getOptionValueSource(key5);
+          if (cmd.getOptionValueSource(key6) !== void 0) {
+            source = cmd.getOptionValueSource(key6);
           }
         });
         return source;
@@ -2778,8 +2778,8 @@ Expecting one of '${allowedValues.join("', '")}'`);
           const result = {};
           const len = this.options.length;
           for (let i = 0; i < len; i++) {
-            const key5 = this.options[i].attributeName();
-            result[key5] = key5 === this._versionOptionName ? this._version : this[key5];
+            const key6 = this.options[i].attributeName();
+            result[key6] = key6 === this._versionOptionName ? this._version : this[key6];
           }
           return result;
         }
@@ -3524,7 +3524,9 @@ function readCliEnv() {
     piAgentDir: runtimeEnv["PI_CODING_AGENT_DIR"],
     piSessionDir: runtimeEnv["PI_CODING_AGENT_SESSION_DIR"],
     hermesAgentDir: runtimeEnv["HERMES_CODING_AGENT_DIR"],
-    hermesSessionDir: runtimeEnv["HERMES_CODING_AGENT_SESSION_DIR"]
+    hermesSessionDir: runtimeEnv["HERMES_CODING_AGENT_SESSION_DIR"],
+    opencodeDataDir: runtimeEnv["OPENCODE_DATA_DIR"],
+    opencodeDbPath: runtimeEnv["OPENCODE_DB"]
   };
 }
 
@@ -3575,9 +3577,9 @@ function isNetworkError(err) {
 
 // src/sync/parser-factory.ts
 init_esm_shims();
-import { existsSync } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join5 } from "path";
+import { existsSync, readdirSync, statSync } from "fs";
+import { homedir as homedir5 } from "os";
+import { isAbsolute as isAbsolute2, join as join6 } from "path";
 
 // ../../packages/parsers/src/index.ts
 init_esm_shims();
@@ -3612,6 +3614,14 @@ function readHermesSessionDir() {
   const value = runtimeEnv2["HERMES_CODING_AGENT_SESSION_DIR"]?.trim();
   return value === void 0 || value.length === 0 ? void 0 : value;
 }
+function readOpenCodeDataDir() {
+  const value = runtimeEnv2["OPENCODE_DATA_DIR"]?.trim();
+  return value === void 0 || value.length === 0 ? void 0 : value;
+}
+function readOpenCodeDbPath() {
+  const value = runtimeEnv2["OPENCODE_DB"]?.trim();
+  return value === void 0 || value.length === 0 ? void 0 : value;
+}
 
 // ../../packages/parsers/src/types.ts
 init_esm_shims();
@@ -4090,11 +4100,414 @@ async function* parseCodex(opts) {
   }
 }
 
-// ../../packages/parsers/src/pi/index.ts
+// ../../packages/parsers/src/opencode/index.ts
 init_esm_shims();
-import { stat as stat4 } from "fs/promises";
+import { readdir as readdir2, stat as stat4 } from "fs/promises";
 import { homedir as homedir3 } from "os";
-import { join as join4 } from "path";
+import { basename, isAbsolute, join as join4 } from "path";
+
+// ../../packages/parsers/src/opencode/bucketize.ts
+init_esm_shims();
+import { readFile } from "fs/promises";
+import { DatabaseSync } from "sqlite";
+
+// ../../packages/parsers/src/opencode/events.ts
+init_esm_shims();
+function isObject3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isFiniteNumber3(value) {
+  return typeof value === "number" && Number.isFinite(value);
+}
+function timestampMs(value) {
+  if (isFiniteNumber3(value)) {
+    return value;
+  }
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const parsed = Date.parse(value);
+  return Number.isFinite(parsed) ? parsed : void 0;
+}
+function isOpenCodeTokens(value) {
+  if (!isObject3(value)) {
+    return false;
+  }
+  const keys = ["input", "output", "reasoning"];
+  for (const k of keys) {
+    const v = value[k];
+    if (v !== void 0 && !isFiniteNumber3(v)) {
+      return false;
+    }
+  }
+  const cache = value["cache"];
+  if (cache !== void 0) {
+    if (!isObject3(cache)) {
+      return false;
+    }
+    for (const k of ["read", "write"]) {
+      const v = cache[k];
+      if (v !== void 0 && !isFiniteNumber3(v)) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+function usageFromModernMessage(value, fallbackSessionId, fallbackTimestampMs) {
+  const model = value["model"];
+  if (!isObject3(model)) {
+    return void 0;
+  }
+  const providerId = model["providerID"];
+  const modelId3 = model["modelID"] ?? model["id"];
+  if (typeof providerId !== "string" || typeof modelId3 !== "string") {
+    return void 0;
+  }
+  const tokens = value["tokens"];
+  if (!isOpenCodeTokens(tokens)) {
+    return void 0;
+  }
+  const time = value["time"];
+  const messageTimestampMs = isObject3(time) ? timestampMs(time["created"] ?? time["completed"]) : void 0;
+  const sessionId = typeof value["sessionID"] === "string" ? value["sessionID"] : fallbackSessionId;
+  const tsMs = messageTimestampMs ?? fallbackTimestampMs;
+  if (sessionId === void 0 || tsMs === void 0) {
+    return void 0;
+  }
+  return {
+    sessionId,
+    providerId,
+    modelId: modelId3,
+    timestampMs: tsMs,
+    tokens
+  };
+}
+function usageFromLegacyMessage(value, fallbackSessionId, fallbackTimestampMs) {
+  if (value["role"] !== "assistant") {
+    return void 0;
+  }
+  const providerId = value["providerID"];
+  const modelId3 = value["modelID"];
+  const tokens = value["tokens"];
+  if (typeof providerId !== "string" || typeof modelId3 !== "string" || !isOpenCodeTokens(tokens)) {
+    return void 0;
+  }
+  const time = value["time"];
+  const messageTimestampMs = isObject3(time) ? timestampMs(time["created"] ?? time["completed"]) : void 0;
+  const sessionId = typeof value["sessionID"] === "string" ? value["sessionID"] : fallbackSessionId;
+  const tsMs = messageTimestampMs ?? fallbackTimestampMs;
+  if (sessionId === void 0 || tsMs === void 0) {
+    return void 0;
+  }
+  return {
+    sessionId,
+    providerId,
+    modelId: modelId3,
+    timestampMs: tsMs,
+    tokens
+  };
+}
+function usageFromMetadataMessage(value, fallbackSessionId, fallbackTimestampMs) {
+  if (value["role"] !== "assistant") {
+    return void 0;
+  }
+  const metadata = value["metadata"];
+  if (!isObject3(metadata)) {
+    return void 0;
+  }
+  const assistant = metadata["assistant"];
+  if (!isObject3(assistant)) {
+    return void 0;
+  }
+  const providerId = assistant["providerID"];
+  const modelId3 = assistant["modelID"];
+  const tokens = assistant["tokens"];
+  if (typeof providerId !== "string" || typeof modelId3 !== "string" || !isOpenCodeTokens(tokens)) {
+    return void 0;
+  }
+  const time = metadata["time"];
+  const messageTimestampMs = isObject3(time) ? timestampMs(time["created"] ?? time["completed"]) : void 0;
+  const sessionId = typeof metadata["sessionID"] === "string" ? metadata["sessionID"] : fallbackSessionId;
+  const tsMs = messageTimestampMs ?? fallbackTimestampMs;
+  if (sessionId === void 0 || tsMs === void 0) {
+    return void 0;
+  }
+  return {
+    sessionId,
+    providerId,
+    modelId: modelId3,
+    timestampMs: tsMs,
+    tokens
+  };
+}
+function pickOpenCodeUsage(value, fallbackSessionId, fallbackTimestampMs) {
+  if (!isObject3(value)) {
+    return void 0;
+  }
+  return usageFromModernMessage(value, fallbackSessionId, fallbackTimestampMs) ?? usageFromLegacyMessage(value, fallbackSessionId, fallbackTimestampMs) ?? usageFromMetadataMessage(value, fallbackSessionId, fallbackTimestampMs);
+}
+
+// ../../packages/parsers/src/opencode/bucketize.ts
+var MISSING_SESSION_MESSAGE_TABLE_PATTERN = /no such table: session_message/u;
+function key3(hourUtc, model, sessionId) {
+  return `${hourUtc.toISOString()}|${model}|${sessionId}`;
+}
+function modelId(provider, model) {
+  const trimmedProvider = provider.trim();
+  const trimmedModel = model.trim();
+  if (trimmedProvider.length === 0 || trimmedModel.length === 0) {
+    return void 0;
+  }
+  return `${trimmedProvider}/${trimmedModel}`;
+}
+function finiteTimestampMs(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function positive(value) {
+  return Math.max(0, value ?? 0);
+}
+function addUsage(accumulators, usage) {
+  const model = modelId(usage.providerId, usage.modelId);
+  if (model === void 0) {
+    return;
+  }
+  const inputTokens = positive(usage.tokens.input);
+  const outputTokens = positive(usage.tokens.output) + positive(usage.tokens.reasoning);
+  const cacheReadTokens = positive(usage.tokens.cache?.read);
+  const cacheCreateTokens = positive(usage.tokens.cache?.write);
+  if (inputTokens === 0 && outputTokens === 0 && cacheReadTokens === 0 && cacheCreateTokens === 0) {
+    return;
+  }
+  const eventAt = new Date(usage.timestampMs);
+  const hourUtc = startOfUtcHour(eventAt);
+  const sessionId = `opencode:${usage.sessionId}`;
+  const accumulatorKey = key3(hourUtc, model, sessionId);
+  const existing = accumulators.get(accumulatorKey);
+  if (existing === void 0) {
+    accumulators.set(accumulatorKey, {
+      hourUtc,
+      model,
+      sessionId,
+      inputTokens,
+      outputTokens,
+      cacheReadTokens,
+      cacheCreateTokens,
+      sessionStartedAt: eventAt,
+      sessionLastSeenAt: eventAt
+    });
+    return;
+  }
+  existing.inputTokens += inputTokens;
+  existing.outputTokens += outputTokens;
+  existing.cacheReadTokens += cacheReadTokens;
+  existing.cacheCreateTokens += cacheCreateTokens;
+  if (eventAt.getTime() < existing.sessionStartedAt.getTime()) {
+    existing.sessionStartedAt = eventAt;
+  }
+  if (eventAt.getTime() > existing.sessionLastSeenAt.getTime()) {
+    existing.sessionLastSeenAt = eventAt;
+  }
+}
+function* finalizedBuckets(accumulators) {
+  for (const acc of accumulators.values()) {
+    yield {
+      harness: "opencode",
+      model: acc.model,
+      hourUtc: acc.hourUtc,
+      inputTokens: acc.inputTokens,
+      outputTokens: acc.outputTokens,
+      cacheReadTokens: acc.cacheReadTokens,
+      cacheCreateTokens: acc.cacheCreateTokens,
+      sessionIds: /* @__PURE__ */ new Set([acc.sessionId]),
+      sessionStartedAt: acc.sessionStartedAt,
+      sessionLastSeenAt: acc.sessionLastSeenAt
+    };
+  }
+}
+function parseJson(value) {
+  return typeof value === "string" ? JSON.parse(value) : value;
+}
+function isMissingTableError(err) {
+  return err instanceof Error && MISSING_SESSION_MESSAGE_TABLE_PATTERN.test(err.message);
+}
+function* readSessionMessageRows(db, cutoff) {
+  const statement = db.prepare(`
+    select session_id as "sessionId", time_created as "timeCreated", data
+    from session_message
+    where type = 'assistant' and time_created >= ?
+    order by time_created asc, id asc
+  `);
+  yield* statement.all(cutoff.getTime());
+}
+async function* bucketizeOpenCodeDatabase(path2, cutoff, logger) {
+  const accumulators = /* @__PURE__ */ new Map();
+  let db;
+  try {
+    db = new DatabaseSync(path2, { readOnly: true, timeout: 1e3 });
+    for (const row of readSessionMessageRows(db, cutoff)) {
+      const sessionId = typeof row.sessionId === "string" ? row.sessionId : void 0;
+      const fallbackTimestampMs = finiteTimestampMs(row.timeCreated);
+      let parsed;
+      try {
+        parsed = parseJson(row.data);
+      } catch {
+        logger.warn("malformed opencode sqlite message", { path: path2 });
+        continue;
+      }
+      const usage = pickOpenCodeUsage(parsed, sessionId, fallbackTimestampMs);
+      if (usage !== void 0) {
+        addUsage(accumulators, usage);
+      }
+    }
+  } catch (err) {
+    if (!isMissingTableError(err)) {
+      logger.warn("failed to parse opencode sqlite database", { path: path2 });
+    }
+  } finally {
+    db?.close();
+  }
+  yield* finalizedBuckets(accumulators);
+}
+async function* bucketizeOpenCodeJsonFile(path2, logger) {
+  let parsed;
+  try {
+    parsed = JSON.parse(await readFile(path2, "utf8"));
+  } catch {
+    logger.warn("malformed opencode json file", { path: path2 });
+    return;
+  }
+  const usage = pickOpenCodeUsage(parsed);
+  if (usage === void 0) {
+    return;
+  }
+  const accumulators = /* @__PURE__ */ new Map();
+  addUsage(accumulators, usage);
+  yield* finalizedBuckets(accumulators);
+}
+
+// ../../packages/parsers/src/opencode/index.ts
+var OPENCODE_DB_FILE_PATTERN = /^opencode(?:-[^/]+)?\.db$/u;
+async function pathKind(path2) {
+  try {
+    const s = await stat4(path2);
+    if (s.isFile()) {
+      return "file";
+    }
+    if (s.isDirectory()) {
+      return "directory";
+    }
+    return "missing";
+  } catch {
+    return "missing";
+  }
+}
+function defaultDataRoot() {
+  return readOpenCodeDataDir() ?? join4(homedir3(), ".local", "share", "opencode");
+}
+function resolveDefaultRoot() {
+  const dbPath = readOpenCodeDbPath();
+  if (dbPath === void 0) {
+    return defaultDataRoot();
+  }
+  if (dbPath === ":memory:") {
+    return dbPath;
+  }
+  if (isAbsolute(dbPath)) {
+    return dbPath;
+  }
+  return join4(defaultDataRoot(), dbPath);
+}
+async function listOpenCodeDatabases(root) {
+  let entries;
+  try {
+    entries = await readdir2(root, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+  return entries.filter((entry) => entry.isFile() && OPENCODE_DB_FILE_PATTERN.test(String(entry.name))).map((entry) => join4(root, String(entry.name)));
+}
+async function listProjectLegacyRoots(root) {
+  const projectRoot = join4(root, "project");
+  let entries;
+  try {
+    entries = await readdir2(projectRoot, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+  return entries.filter((entry) => entry.isDirectory()).flatMap((entry) => [
+    join4(projectRoot, String(entry.name), "storage", "message"),
+    join4(projectRoot, String(entry.name), "storage", "session", "message")
+  ]);
+}
+async function legacyRoots(root) {
+  return [
+    join4(root, "storage", "message"),
+    join4(root, "storage", "session", "message"),
+    ...await listProjectLegacyRoots(root)
+  ];
+}
+async function* walkJson(root, cutoff) {
+  let entries;
+  try {
+    entries = await readdir2(root, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  for (const entry of entries) {
+    const full = join4(root, String(entry.name));
+    if (entry.isDirectory()) {
+      yield* walkJson(full, cutoff);
+      continue;
+    }
+    if (!(entry.isFile() && entry.name.endsWith(".json"))) {
+      continue;
+    }
+    let mtime;
+    try {
+      ({ mtime } = await stat4(full));
+    } catch {
+      continue;
+    }
+    if (mtime.getTime() >= cutoff.getTime()) {
+      yield full;
+    }
+  }
+}
+async function* parseOpenCode(opts) {
+  const logger = opts.logger ?? consoleLogger;
+  const root = opts.root ?? resolveDefaultRoot();
+  const kind = await pathKind(root);
+  if (kind === "missing") {
+    return;
+  }
+  if (kind === "file") {
+    if (basename(root).endsWith(".json")) {
+      yield* bucketizeOpenCodeJsonFile(root, logger);
+      return;
+    }
+    yield* bucketizeOpenCodeDatabase(root, opts.cutoff, logger);
+    return;
+  }
+  const databases = await listOpenCodeDatabases(root);
+  if (databases.length > 0) {
+    for (const dbPath of databases) {
+      yield* bucketizeOpenCodeDatabase(dbPath, opts.cutoff, logger);
+    }
+    return;
+  }
+  for (const legacyRoot of await legacyRoots(root)) {
+    for await (const file of walkJson(legacyRoot, opts.cutoff)) {
+      yield* bucketizeOpenCodeJsonFile(file, logger);
+    }
+  }
+}
+
+// ../../packages/parsers/src/pi/index.ts
+init_esm_shims();
+import { stat as stat5 } from "fs/promises";
+import { homedir as homedir4 } from "os";
+import { join as join5 } from "path";
 
 // ../../packages/parsers/src/pi/bucketize.ts
 init_esm_shims();
@@ -4103,27 +4516,27 @@ import { createInterface as createInterface3 } from "readline";
 
 // ../../packages/parsers/src/pi/events.ts
 init_esm_shims();
-function isObject3(value) {
+function isObject4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function isFiniteNumber3(value) {
+function isFiniteNumber4(value) {
   return typeof value === "number" && Number.isFinite(value);
 }
 function isPiUsage(value) {
-  if (!isObject3(value)) {
+  if (!isObject4(value)) {
     return false;
   }
   const keys = ["input", "output", "cacheRead", "cacheWrite"];
   for (const k of keys) {
     const v = value[k];
-    if (v !== void 0 && !isFiniteNumber3(v)) {
+    if (v !== void 0 && !isFiniteNumber4(v)) {
       return false;
     }
   }
   return true;
 }
 function isPiAssistantMessageEntry(value) {
-  if (!isObject3(value)) {
+  if (!isObject4(value)) {
     return false;
   }
   if (value["type"] !== "message") {
@@ -4133,7 +4546,7 @@ function isPiAssistantMessageEntry(value) {
     return false;
   }
   const message = value["message"];
-  if (!isObject3(message)) {
+  if (!isObject4(message)) {
     return false;
   }
   if (message["role"] !== "assistant") {
@@ -4148,7 +4561,7 @@ function isPiAssistantMessageEntry(value) {
   if (message["stopReason"] !== void 0 && typeof message["stopReason"] !== "string") {
     return false;
   }
-  if (message["timestamp"] !== void 0 && !isFiniteNumber3(message["timestamp"])) {
+  if (message["timestamp"] !== void 0 && !isFiniteNumber4(message["timestamp"])) {
     return false;
   }
   if (!isPiUsage(message["usage"])) {
@@ -4158,7 +4571,7 @@ function isPiAssistantMessageEntry(value) {
 }
 
 // ../../packages/parsers/src/pi/bucketize.ts
-function key3(hourUtc, model) {
+function key4(hourUtc, model) {
   return `${hourUtc.toISOString()}|${model}`;
 }
 function eventTimestampMs(entry) {
@@ -4167,7 +4580,7 @@ function eventTimestampMs(entry) {
   }
   return Date.parse(entry.timestamp);
 }
-function modelId(provider, model) {
+function modelId2(provider, model) {
   const trimmedProvider = provider.trim();
   const trimmedModel = model.trim();
   if (trimmedProvider.length === 0 || trimmedModel.length === 0) {
@@ -4206,7 +4619,7 @@ async function* bucketizePiStyleFile(path2, harness, logger) {
       if (!Number.isFinite(tsMs)) {
         continue;
       }
-      const model = modelId(parsed.message.provider, parsed.message.model);
+      const model = modelId2(parsed.message.provider, parsed.message.model);
       if (model === void 0) {
         continue;
       }
@@ -4226,7 +4639,7 @@ async function* bucketizePiStyleFile(path2, harness, logger) {
         sessionLastSeenAt = eventAt;
       }
       const hourUtc = startOfUtcHour(eventAt);
-      const k = key3(hourUtc, model);
+      const k = key4(hourUtc, model);
       const existing = buckets.get(k);
       if (existing === void 0) {
         buckets.set(k, {
@@ -4271,7 +4684,7 @@ async function* bucketizePiStyleFile(path2, harness, logger) {
 // ../../packages/parsers/src/pi/index.ts
 async function isFile3(path2) {
   try {
-    return (await stat4(path2)).isFile();
+    return (await stat5(path2)).isFile();
   } catch {
     return false;
   }
@@ -4281,14 +4694,14 @@ function defaultPiRoot() {
   if (sessionDir !== void 0) {
     return sessionDir;
   }
-  return join4(readPiAgentDir() ?? join4(homedir3(), ".pi", "agent"), "sessions");
+  return join5(readPiAgentDir() ?? join5(homedir4(), ".pi", "agent"), "sessions");
 }
 function defaultHermesRoot() {
   const sessionDir = readHermesSessionDir();
   if (sessionDir !== void 0) {
     return sessionDir;
   }
-  return join4(readHermesAgentDir() ?? join4(homedir3(), ".hermes", "agent"), "sessions");
+  return join5(readHermesAgentDir() ?? join5(homedir4(), ".hermes", "agent"), "sessions");
 }
 async function* parsePiStyle(opts, harness, defaultRoot2) {
   const logger = opts.logger ?? consoleLogger;
@@ -4309,29 +4722,69 @@ async function* parseHermes(opts) {
 }
 
 // src/sync/parser-factory.ts
+var OPENCODE_DB_FILE_PATTERN2 = /^opencode(?:-[^/]+)?\.db$/u;
 function sessionsRoot(agentDir, sessionDir, fallbackAgentDir) {
-  return sessionDir ?? join5(agentDir ?? fallbackAgentDir, "sessions");
+  return sessionDir ?? join6(agentDir ?? fallbackAgentDir, "sessions");
+}
+function isFile4(path2) {
+  try {
+    return statSync(path2).isFile();
+  } catch {
+    return false;
+  }
+}
+function defaultOpenCodeDataRoot(home) {
+  return join6(home, ".local", "share", "opencode");
+}
+function openCodeRoot(home, env) {
+  const dataRoot = env.opencodeDataDir ?? defaultOpenCodeDataRoot(home);
+  const dbPath = env.opencodeDbPath;
+  if (dbPath === void 0 || dbPath === ":memory:") {
+    return dbPath ?? dataRoot;
+  }
+  return isAbsolute2(dbPath) ? dbPath : join6(dataRoot, dbPath);
+}
+function hasOpenCodeDatabase(root) {
+  let entries;
+  try {
+    entries = readdirSync(root);
+  } catch {
+    return false;
+  }
+  return entries.some((entry) => OPENCODE_DB_FILE_PATTERN2.test(entry) && isFile4(join6(root, entry)));
+}
+function openCodeSourceExists(root) {
+  if (root === ":memory:") {
+    return false;
+  }
+  if (isFile4(root)) {
+    return true;
+  }
+  return hasOpenCodeDatabase(root) || existsSync(join6(root, "storage", "message")) || existsSync(join6(root, "storage", "session", "message")) || existsSync(join6(root, "project"));
 }
 function buildRealParserFactory() {
   return (ctx) => {
-    const home = homedir4();
+    const home = homedir5();
     const env = readCliEnv();
-    const codexSessionsRoot = join5(home, ".codex", "sessions");
-    const codexArchivedRoot = join5(home, ".codex", "archived_sessions");
+    const codexSessionsRoot = join6(home, ".codex", "sessions");
+    const codexArchivedRoot = join6(home, ".codex", "archived_sessions");
     const codexExists = existsSync(codexSessionsRoot) || existsSync(codexArchivedRoot);
     const envDir = env.claudeConfigDir;
-    const claudeRoot = envDir == null ? join5(home, ".claude", "projects") : join5(envDir, "projects");
+    const claudeRoot = envDir == null ? join6(home, ".claude", "projects") : join6(envDir, "projects");
     const claudeExists = existsSync(claudeRoot);
-    const piRoot = sessionsRoot(env.piAgentDir, env.piSessionDir, join5(home, ".pi", "agent"));
+    const piRoot = sessionsRoot(env.piAgentDir, env.piSessionDir, join6(home, ".pi", "agent"));
     const piExists = existsSync(piRoot);
-    const hermesRoot = sessionsRoot(env.hermesAgentDir, env.hermesSessionDir, join5(home, ".hermes", "agent"));
+    const hermesRoot = sessionsRoot(env.hermesAgentDir, env.hermesSessionDir, join6(home, ".hermes", "agent"));
     const hermesExists = existsSync(hermesRoot);
+    const opencodeRoot = openCodeRoot(home, env);
+    const opencodeExists = openCodeSourceExists(opencodeRoot);
     return {
-      anySourceExisted: codexExists || claudeExists || piExists || hermesExists,
+      anySourceExisted: codexExists || claudeExists || piExists || hermesExists || opencodeExists,
       codex: parseCodex({ cutoff: ctx.cutoff }),
       claudeCode: parseClaude({ cutoff: ctx.cutoff, root: claudeRoot }),
       pi: parsePi({ cutoff: ctx.cutoff, root: piRoot }),
-      hermes: parseHermes({ cutoff: ctx.cutoff, root: hermesRoot })
+      hermes: parseHermes({ cutoff: ctx.cutoff, root: hermesRoot }),
+      opencode: parseOpenCode({ cutoff: ctx.cutoff, root: opencodeRoot })
     };
   };
 }
@@ -4341,11 +4794,11 @@ init_esm_shims();
 
 // src/sync/aggregate.ts
 init_esm_shims();
-import { createHash } from "crypto";
+import { createHmac } from "crypto";
 function toIso(hourUtc) {
   return hourUtc instanceof Date ? hourUtc.toISOString() : hourUtc;
 }
-function key4(b) {
+function key5(b) {
   return `${b.harness} ${b.model} ${toIso(b.hourUtc)}`;
 }
 function finalize(acc) {
@@ -4360,8 +4813,12 @@ function finalize(acc) {
     sessionCount: acc.sessionIds.size
   };
 }
-function createSessionKey(harness, localSessionId) {
-  return createHash("sha256").update(harness).update("\0").update(localSessionId).digest("hex");
+var SESSION_KEY_SALT_PATTERN = /^[a-f0-9]{64}$/u;
+function createSessionKey(harness, localSessionId, sessionKeySalt) {
+  if (!SESSION_KEY_SALT_PATTERN.test(sessionKeySalt)) {
+    throw new Error("invalid session key salt");
+  }
+  return createHmac("sha256", Buffer.from(sessionKeySalt, "hex")).update("oopst/session-key/v1").update("\0").update(harness).update("\0").update(localSessionId).digest("hex");
 }
 function sessionMapKey(harness, sessionKey) {
   return `${harness} ${sessionKey}`;
@@ -4374,8 +4831,8 @@ function finalizeSession(acc) {
     lastSeenAt: acc.lastSeenAt.toISOString()
   };
 }
-function addSessionAccumulator(sessionAccumulators, bucket, localSessionId) {
-  const sessionKey = createSessionKey(bucket.harness, localSessionId);
+function addSessionAccumulator(sessionAccumulators, bucket, localSessionId, sessionKeySalt) {
+  const sessionKey = createSessionKey(bucket.harness, localSessionId, sessionKeySalt);
   const sessionAccumulatorKey = sessionMapKey(bucket.harness, sessionKey);
   const existingSession = sessionAccumulators.get(sessionAccumulatorKey);
   if (existingSession) {
@@ -4398,7 +4855,7 @@ async function* aggregateUsage(source, options) {
   const accumulators = /* @__PURE__ */ new Map();
   const sessionAccumulators = /* @__PURE__ */ new Map();
   for await (const bucket of source) {
-    const k = key4(bucket);
+    const k = key5(bucket);
     let acc = accumulators.get(k);
     if (!acc) {
       acc = {
@@ -4419,7 +4876,7 @@ async function* aggregateUsage(source, options) {
     acc.cacheCreateTokens += bucket.cacheCreateTokens;
     for (const id of bucket.sessionIds) {
       acc.sessionIds.add(id);
-      addSessionAccumulator(sessionAccumulators, bucket, id);
+      addSessionAccumulator(sessionAccumulators, bucket, id, options.sessionKeySalt);
     }
   }
   const finalized = [];
@@ -4457,11 +4914,11 @@ var __commonJS2 = (cb, mod) => function() {
   return mod || (0, cb[__getOwnPropNames2(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __copyProps2 = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames2(from), i = 0, n = keys.length, key5; i < n; i++) {
-    key5 = keys[i];
-    if (!__hasOwnProp2.call(to, key5) && key5 !== except) __defProp2(to, key5, {
-      get: ((k) => from[k]).bind(null, key5),
-      enumerable: !(desc = __getOwnPropDesc2(from, key5)) || desc.enumerable
+  if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames2(from), i = 0, n = keys.length, key6; i < n; i++) {
+    key6 = keys[i];
+    if (!__hasOwnProp2.call(to, key6) && key6 !== except) __defProp2(to, key6, {
+      get: ((k) => from[k]).bind(null, key6),
+      enumerable: !(desc = __getOwnPropDesc2(from, key6)) || desc.enumerable
     });
   }
   return to;
@@ -4736,7 +5193,7 @@ init_esm_shims();
 
 // ../../node_modules/.pnpm/@trpc+server@11.17.0_typescript@6.0.3/node_modules/@trpc/server/dist/codes-DagpWZLc.mjs
 init_esm_shims();
-function isObject4(value) {
+function isObject5(value) {
   return !!value && !Array.isArray(value) && typeof value === "object";
 }
 function emptyObject() {
@@ -4783,11 +5240,11 @@ var __commonJS3 = (cb, mod) => function() {
   return mod || (0, cb[__getOwnPropNames3(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __copyProps3 = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames3(from), i = 0, n = keys.length, key5; i < n; i++) {
-    key5 = keys[i];
-    if (!__hasOwnProp3.call(to, key5) && key5 !== except) __defProp3(to, key5, {
-      get: ((k) => from[k]).bind(null, key5),
-      enumerable: !(desc = __getOwnPropDesc3(from, key5)) || desc.enumerable
+  if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames3(from), i = 0, n = keys.length, key6; i < n; i++) {
+    key6 = keys[i];
+    if (!__hasOwnProp3.call(to, key6) && key6 !== except) __defProp3(to, key6, {
+      get: ((k) => from[k]).bind(null, key6),
+      enumerable: !(desc = __getOwnPropDesc3(from, key6)) || desc.enumerable
     });
   }
   return to;
@@ -4805,9 +5262,9 @@ function createInnerProxy(callback, path2, memo) {
   var _memo$cacheKey;
   const cacheKey = path2.join(".");
   (_memo$cacheKey = memo[cacheKey]) !== null && _memo$cacheKey !== void 0 || (memo[cacheKey] = new Proxy(noop, {
-    get(_obj, key5) {
-      if (typeof key5 !== "string" || key5 === "then") return void 0;
-      return createInnerProxy(callback, [...path2, key5], memo);
+    get(_obj, key6) {
+      if (typeof key6 !== "string" || key6 === "then") return void 0;
+      return createInnerProxy(callback, [...path2, key6], memo);
     },
     apply(_1, _2, args) {
       const lastOfPath = path2[path2.length - 1];
@@ -4947,8 +5404,8 @@ function transformResult(response, transformer) {
   } catch (_unused) {
     throw new TransformResultError();
   }
-  if (!result.ok && (!isObject4(result.error.error) || typeof result.error.error["code"] !== "number")) throw new TransformResultError();
-  if (result.ok && !isObject4(result.result)) throw new TransformResultError();
+  if (!result.ok && (!isObject5(result.error.error) || typeof result.error.error["code"] !== "number")) throw new TransformResultError();
+  if (result.ok && !isObject5(result.result)) throw new TransformResultError();
   return result;
 }
 var import_objectSpread22 = __toESM3(require_objectSpread22(), 1);
@@ -4960,11 +5417,11 @@ function isTRPCClientError(cause) {
   return cause instanceof TRPCClientError;
 }
 function isTRPCErrorResponse(obj) {
-  return isObject4(obj) && isObject4(obj["error"]) && typeof obj["error"]["code"] === "number" && typeof obj["error"]["message"] === "string";
+  return isObject5(obj) && isObject5(obj["error"]) && typeof obj["error"]["code"] === "number" && typeof obj["error"]["message"] === "string";
 }
 function getMessageFromUnknownError(err, fallback) {
   if (typeof err === "string") return err;
-  if (isObject4(err) && typeof err["message"] === "string") return err["message"];
+  if (isObject5(err) && typeof err["message"] === "string") return err["message"];
   return fallback;
 }
 var TRPCClientError = class TRPCClientError2 extends Error {
@@ -5209,11 +5666,11 @@ function dataLoader(batchLoader) {
       });
     }
   }
-  function load(key5) {
+  function load(key6) {
     var _dispatchTimer;
     const item = {
       aborted: false,
-      key: key5,
+      key: key6,
       batch: null,
       resolve: throwFatalError,
       reject: throwFatalError
@@ -5588,9 +6045,9 @@ function createTRPCClientProxy(client) {
     const fullPath = pathCopy.join(".");
     return client[procedureType](fullPath, ...args);
   });
-  return createFlatProxy((key5) => {
-    if (key5 === untypedClientSymbol) return client;
-    return proxy[key5];
+  return createFlatProxy((key6) => {
+    if (key6 === untypedClientSymbol) return client;
+    return proxy[key6];
   });
 }
 function createTRPCClient(opts) {
@@ -5827,10 +6284,14 @@ async function runSync(options) {
   const client = options.client ?? createClient({ token: options.token, serverUrl: options.serverUrl, fetch: options.fetch });
   const color = options.color === true;
   let watermark = null;
+  let sessionKeySalt;
   try {
     options.logger.info(phase("Checking server sync point...", color));
-    const wm = await client.sync.getWatermark.query({ device: options.device });
-    watermark = wm.watermarkHourUtc ? new Date(wm.watermarkHourUtc) : null;
+    const { sessionKeySalt: returnedSessionKeySalt, watermarkHourUtc } = await client.sync.getWatermark.mutate({
+      device: options.device
+    });
+    watermark = watermarkHourUtc ? new Date(watermarkHourUtc) : null;
+    sessionKeySalt = returnedSessionKeySalt;
   } catch (err) {
     return failureFromTrpcError(err, options.logger);
   }
@@ -5852,13 +6313,19 @@ async function runSync(options) {
   if (options.harness === void 0 || options.harness === "hermes") {
     sources.push({ label: "Hermes", source: parsers.hermes });
   }
+  if (options.harness === void 0 || options.harness === "opencode") {
+    sources.push({ label: "OpenCode", source: parsers.opencode });
+  }
   let bucketsUploaded = 0;
   let sessionsUploaded = 0;
   let batchesUploaded = 0;
   const batches = [];
   try {
     const progressSources = sources.map((source) => withScanProgress(source, options.logger, color));
-    for await (const batch of aggregateUsage(merge(progressSources), { batchSize: SYNC_BATCH_SIZE })) {
+    for await (const batch of aggregateUsage(merge(progressSources), {
+      batchSize: SYNC_BATCH_SIZE,
+      sessionKeySalt
+    })) {
       if (batch.buckets.length === 0 && batch.sessions.length === 0) {
         continue;
       }
@@ -5887,7 +6354,7 @@ async function runSync(options) {
     options.logger.info(
       `${dryRunPrefix(color)} ${usageRecordText(plannedBuckets)} from ${localSessionText(plannedSessions)} would be uploaded in ${uploadRequestText(batches.length)}.`
     );
-    options.logger.info(muted("No data was sent.", color));
+    options.logger.info(muted("No usage data was uploaded.", color));
     return {
       exitCode: EXIT.success,
       batchesUploaded: batches.length,
@@ -6023,7 +6490,7 @@ function readPackageVersion() {
   return "0.0.0";
 }
 var VERSION = readPackageVersion();
-var SUPPORTED_HARNESSES = ["codex", "claude_code", "pi", "hermes"];
+var SUPPORTED_HARNESSES = ["codex", "claude_code", "pi", "hermes", "opencode"];
 function writeStdoutLine(msg) {
   process4.stdout.write(`${msg}
 `);
@@ -6057,7 +6524,7 @@ function buildCli() {
   const env = readCliEnv();
   const program2 = new Command();
   program2.name("oopst").description("OopsT \u2014 track AI coding token usage across users and devices").version(VERSION).exitOverride();
-  program2.command("sync").description("Scan local Codex and Claude Code logs and upload hourly usage records").option("--token <token>", "CLI API token (or OOPST_TOKEN env)").option("--device <name>", "Device name (or OOPST_DEVICE env)").option("--server <url>", "Server base URL", env.serverUrl).option("--lookback-days <days>", "Override watermark lookback", DEFAULT_LOOKBACK_DAYS).option("--harness <harness>", "Restrict to codex|claude_code|pi|hermes").option("--dry-run", "Parse and print without uploading", false).option("--verbose", "Verbose logs", false).action(
+  program2.command("sync").description("Scan local AI coding harness logs and upload hourly usage records").option("--token <token>", "CLI API token (or OOPST_TOKEN env)").option("--device <name>", "Device name (or OOPST_DEVICE env)").option("--server <url>", "Server base URL", env.serverUrl).option("--lookback-days <days>", "Override watermark lookback", DEFAULT_LOOKBACK_DAYS).option("--harness <harness>", "Restrict to codex|claude_code|pi|hermes|opencode").option("--dry-run", "Parse and print without uploading", false).option("--verbose", "Verbose logs", false).action(
     async (raw) => {
       const token = raw.token ?? env.token;
       const device = raw.device ?? env.device;