@khalilgharbaoui/opencode-claude-code-plugin 0.61.1 → 0.62.0

package/dist/index.js

@@ -906,6 +906,44 @@ function recordUsageReading(account, window, reading, now = Date.now()) {
   cache = { path: file, usage: kept };
   return writeStore(file, kept, store.known) ? entry : null;
 }
+function usageReadingsFromObservation(observation, previous, now = Date.now()) {
+  const out = [];
+  const windows = observation.windows ?? {};
+  const limiting = observation.window;
+  if (limiting && observation.status) {
+    const own = windows[limiting];
+    out.push([
+      limiting,
+      {
+        utilization: finite(observation.utilization) ? observation.utilization : own && finite(own.utilization) ? own.utilization : null,
+        resetsAt: finite(observation.resetsAt) ? observation.resetsAt : own?.resetsAt,
+        status: observation.status
+      }
+    ]);
+  }
+  for (const [window, own] of Object.entries(windows)) {
+    if (window === limiting || !finite(own.utilization)) continue;
+    const before = previous(window);
+    const stillRefused = before !== void 0 && before.status === "rejected" && isReadingCurrent(before, now) && own.utilization >= 1;
+    out.push([window, { utilization: own.utilization, resetsAt: own.resetsAt, status: stillRefused ? "rejected" : "allowed" }]);
+  }
+  return out;
+}
+function recordRateLimitObservation(account, observation, now = Date.now()) {
+  if (!NAME.test(account)) return false;
+  const file = accountUsageStorePath();
+  const store = parseStore(file, now);
+  const merged = store.usage;
+  const windows = merged.get(account) ?? /* @__PURE__ */ new Map();
+  const previous = (window) => windows.get(window) ?? cached(now).get(account)?.get(window);
+  const readings = usageReadingsFromObservation(observation, previous, now).filter(([window]) => NAME.test(window));
+  if (readings.length === 0) return false;
+  for (const [window, reading] of readings) windows.set(window, applyReading(previous(window), reading, now));
+  merged.set(account, windows);
+  const kept = bounded(merged, now);
+  cache = { path: file, usage: kept };
+  return writeStore(file, kept, store.known);
+}
 function markUsageNoted(account, window, thresholds, now = Date.now()) {
   if (!NAME.test(account) || !NAME.test(window) || thresholds.length === 0) return false;
   const file = accountUsageStorePath();
@@ -992,6 +1030,18 @@ function str(value) {
 function num(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
+function parseUnifiedWindows(value) {
+  if (!isRecord(value)) return void 0;
+  const out = {};
+  for (const [window, raw] of Object.entries(value)) {
+    if (!isRecord(raw)) continue;
+    const utilization = num(raw.utilization);
+    if (utilization === void 0 || utilization < 0) continue;
+    const resetsAt = num(raw.resetsAt);
+    out[window] = resetsAt === void 0 ? { utilization } : { utilization, resetsAt };
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 var RATE_LIMIT_MARKER = "\u258C **rate limit:**";
 var RATE_LIMIT_ACTION = "Enable extra usage or add credits on the account, wait for the window to reset, switch account, org or plan, or authenticate with an API key.";
 var OVERAGE_DISABLED_REASONS = {
@@ -1020,6 +1070,7 @@ function parseRateLimitEvent(msg) {
   if (msg.type !== "rate_limit_event") return null;
   const info = msg.rate_limit_info;
   if (!isRecord(info)) return null;
+  const windows = parseUnifiedWindows(info.unifiedWindows);
   return {
     status: str(info.status),
     rateLimitType: str(info.rateLimitType),
@@ -1028,7 +1079,8 @@ function parseRateLimitEvent(msg) {
     isUsingOverage: info.isUsingOverage === true,
     overageStatus: str(info.overageStatus),
     overageResetsAt: num(info.overageResetsAt),
-    overageDisabledReason: str(info.overageDisabledReason)
+    overageDisabledReason: str(info.overageDisabledReason),
+    ...windows ? { windows } : {}
   };
 }
 function resetsAtToMs(resetsAt) {
@@ -12471,7 +12523,7 @@ function collectSkills(root, claimed, found) {
     if (!skill) continue;
     const winner = claimed.get(skill.name);
     if (winner) {
-      if (!sameSkill(winner, skill)) {
+      if (!sameSkill(winner, skill) && firstSkillWarning(`dup:${skill.name}:${winner.dir}:${skill.dir}`)) {
         log.warn("two different skills share a name; bridging the one the nearest root claimed", {
           name: skill.name,
           bridged: winner.dir,
@@ -12484,6 +12536,12 @@ function collectSkills(root, claimed, found) {
     found.push(skill);
   }
 }
+var warnedSkillClashes = /* @__PURE__ */ new Set();
+function firstSkillWarning(key) {
+  if (warnedSkillClashes.has(key)) return false;
+  warnedSkillClashes.add(key);
+  return true;
+}
 var byName = (a, b) => a.name.localeCompare(b.name);
 function discoverOpencodeSkills(cwd) {
   const found = [];
@@ -12584,7 +12642,7 @@ function dropNativelyLoadedSkills(skills, native) {
     }
     const reason = sameCopy ? "same-copy" : sameContent ? "same-content" : "name-taken";
     skipped.push({ skill, native: nameTaken, reason });
-    if (reason === "name-taken") {
+    if (reason === "name-taken" && firstSkillWarning(`taken:${skill.name}:${nameTaken.dir}:${skill.dir}`)) {
       log.warn("claude already registers a different skill under this name; not bridging ours", {
         name: skill.name,
         claudeLoads: nameTaken.dir,
@@ -15222,7 +15280,8 @@ function resolvedProxyMcpTools(config, allEnabledServerNames, modelTools, taken,
     if (route === "withhold") withheld.push(server2);
     else if (route === "bridge") bridged.push(server2);
   }
-  if (codeMode && resolution.defs.length === 0) {
+  if (codeMode && resolution.defs.length === 0 && !codeModeProxyWarned) {
+    codeModeProxyWarned = true;
     log.warn(
       "proxyOpencodeMcpTools cannot route V2 Code Mode's MCP tools, which reach the model through execute; for Code Mode, explicitly allowlist execute in proxyOpencodeTools and use bridgeOpencodeMcp: false with strictMcpConfig: true",
       { servers: allEnabledServerNames }
@@ -15401,6 +15460,7 @@ function warnCliCapsOnInteractive(caps) {
     "agent maxTurns / maxBudgetUsd not applied: the interactive transport cannot pass print-only flags"
   );
 }
+var codeModeProxyWarned = false;
 
 // src/mcp-hot-reload.ts
 var DEFAULT_MCP_HOT_RELOAD_COOLDOWN_MS = 6e4;
@@ -16536,11 +16596,18 @@ function createLineHandler(state, ctx) {
           };
           rememberAccountLimit(ctx.sourceAccount, state.accountLimitHit);
         }
-        if (info?.rateLimitType && info.status) {
-          recordUsageReading(ctx.usageAccount, info.rateLimitType, {
-            utilization: info.utilization ?? null,
+        if (info) {
+          recordRateLimitObservation(ctx.usageAccount, {
+            window: info.rateLimitType,
+            status: info.status,
+            utilization: info.utilization,
             resetsAt: resetsAtToMs(info.resetsAt),
-            status: info.status
+            windows: info.windows ? Object.fromEntries(
+              Object.entries(info.windows).map(([window, own]) => [
+                window,
+                { utilization: own.utilization, resetsAt: resetsAtToMs(own.resetsAt) }
+              ])
+            ) : void 0
           });
         }
         const note = reportRateLimitEvent(msg);