eco-helpers 3.2.18 → 3.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9238296c1185b73d2dfa18af81387f01e7b913af4fa3732491dfeed4a7ba6caf
-  data.tar.gz: 4b8a882badc3d22c2ba166e45284e1b4d1e3912afa8a2452072765917165fe3b
+  metadata.gz: 2f79a58827dc2789ddfcc56e108d93520af92c15152b94338ca51e73cc388210
+  data.tar.gz: e15e69fdb8fa6bd37202aad7f01bebcda80c9aadacc23333a98846a27aeddffd
 SHA512:
-  metadata.gz: 1b0abd929fdb1827a544d18ec6c2a2a49b0807caedae00603f6d656c8e8f4498b5ea500f8f3845fcd44187f156125916456326513da21134c16a73ba7eee32ee
-  data.tar.gz: 755a6f6efa59752b4897506be1bdc2b408a2e7f84c26330b7c192dd805ff3851b13966e8516da6e61517d86b3cb267a6e8884a26069ea20f8be962d5e1886f18
+  metadata.gz: 14faa786d74eb1b096cea772f79903df7f16e0dd903ce8586621f4524413795f0720bad631b0ddbc892cee01d12e6445f2af5ff6ff808d5754bb8593959f5d9a
+  data.tar.gz: b8b28cba91173036b005e3aa9a8e88e0143a932e1342c4aa91f085c73d4e031191e5f09c8f71928547392e41291c8b0128d0455b1b646ab93422247b9cac57b9

data/CHANGELOG.md

@@ -2,6 +2,51 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.2.22] - 2026-08-14
+
+### Fixed
+
+- Republish of `3.2.21`: its `lib/eco/version.rb` shipped with doubled carriage returns
+  (`
+` line endings), causing a `warning: encountered 
 in middle of line` on every
+  load. Functionally identical otherwise; `3.2.21` will be yanked.
+
+## [3.2.21] - 2026-08-14
+
+### Fixed
+
+- Packaging-only republish of `3.2.19` with an allowlisted gemspec (backported from `3.3.0`).
+  Versions `3.2.16`-`3.2.19` shipped internal repository content (`.ai-assistance/` tooling,
+  `.claude/settings.json`) to rubygems.org via the old denylist `spec.files`; `3.2.19` is
+  yanked and `3.2.16`/`3.2.18` are queued for deletion by RubyGems support. `3.2.21` is the
+  identical `lib/` code packaged clean, so constraints like `'~> 3.2.0', '>= 3.2.19'` keep
+  resolving on the 3.2 line (its graphql dependency stays `~> 1.3`, satisfied by the clean
+  `1.3.16`). The version number `3.2.20` is intentionally skipped: it exists as a
+  tagged-but-deliberately-unpublished version (see the 3.3.0-era changelog corrections).
+
+## [3.2.19] - 2026-07-16
+
+Farmers / `cans-upsert` reliability adoption + an ooze KPI counter fix. **Backwards-compatible.**
+Cut from the `v3.2.18` tag (not `master`, which carries the native GraphQL activity/dashboard
+readers depending on the unreleased gem `1.4.0`), so this ships needing only the published
+`ecoportal-api-graphql 1.3.14`.
+
+### Changed
+
+- **Floor `ecoportal-api-graphql` to `>= 1.3.14`** (was `>= 1.3.11`) — pulls the HttpClient
+  429/1015 resilience fix, so bulk `cans-upsert` / register-update live runs are no longer
+  aborted by a single Cloudflare edge rate-limit.
+
+### Fixed
+
+- **Ooze update KPI counters now count GraphQL updates.** `RegisterUpdateCase` tallied
+  `updated`/`failed` only when the result `is_a?(Ecoportal::API::Common::Response)`, but the
+  GraphQL compat layer returns an `Ecoportal::API::GraphQL::Compat::Response` — it duck-types
+  `success?`/`status` yet is not in that class hierarchy, so every GraphQL update was silently
+  uncounted (`Updated 0 (attempted: N)`, `Failed 0`) even when the write applied. The guard is
+  now a duck-type (`respond_to?(:success?)`); `false`/`nil` returns (dry-run / no-op) still skip.
+  **Note:** this fixes the *report* only — the updates themselves were already applying.
+
 ## [3.2.18] - 2026-07-10
 
 Version-identity + regression-guard release. **No behaviour change** vs the fixed `3.2.17` build —

data/lib/eco/api/usecases/ooze_samples/register_update_case.rb

@@ -54,7 +54,10 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
     return unless (pending = queue_shift(ooze_id))
 
     update_ooze(pending).tap do |result|
-      if result.is_a?(Ecoportal::API::Common::Response)
+      # Duck-type, not is_a?: the GraphQL Compat::Response responds to success?/status but is
+      # NOT an Ecoportal::API::Common::Response, so is_a? silently skipped every GraphQL update
+      # (updated/failed stuck at 0). false/nil returns (dry-run / no-op) still fall through.
+      if result.respond_to?(:success?)
         if result.success?
           @updated_oozes += 1
         else
@@ -188,7 +191,8 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
   def update_oozes(batched_oozes = batch_queue)
     batched_oozes.each do |ooze|
       update_ooze(ooze).tap do |result|
-        if result.is_a?(Ecoportal::API::Common::Response)
+        # Duck-type, not is_a? — see #before_loading_new_target (GraphQL Compat::Response).
+        if result.respond_to?(:success?)
           if result.success?
             @updated_oozes += 1
           else

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '3.2.18'.freeze
+  VERSION = '3.2.22'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 3.2.18
+  version: 3.2.22
 platform: ruby
 authors:
 - Oscar Segura
@@ -262,7 +262,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.3.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -272,7 +272,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.3.14
 - !ruby/object:Gem::Dependency
   name: ecoportal-api-v2
   requirement: !ruby/object:Gem::Requirement
@@ -541,29 +541,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".ai-assistance/conventions/code-working-tree-protocol.md"
-- ".ai-assistance/scripts/token-logger.js"
-- ".ai-assistance/scripts/token-report.ts"
-- ".ai-assistance/scripts/token-session-start.js"
-- ".ai-assistance/skills/ep-ai-manager/SKILL.md"
-- ".ai-assistance/skills/ruby-scripting/SKILL.md"
-- ".ai-assistance/standards-version.json"
-- ".ai-assistance/token-budget.json"
-- ".claude/settings.json"
-- ".gitignore"
-- ".idea/.gitignore"
-- ".markdownlint.json"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
-- ".yardopts"
 - CHANGELOG.md
-- CLAUDE.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- eco-helpers.gemspec
 - lib/eco-helpers.rb
 - lib/eco/api.rb
 - lib/eco/api/common.rb

data/.ai-assistance/conventions/code-working-tree-protocol.md

@@ -1,176 +0,0 @@
-# Code Working Tree Protocol
-
-When Claude Code needs to make changes to files **outside** `bridge/inbox/`, it must
-follow this protocol. This prevents Code's changes from mixing with in-progress CoWork
-edits and ensures a clean, traceable commit history.
-
----
-
-## When this applies
-
-Any time Code intends to modify files in the working tree that are not bridge task files
-(i.e., not `.ai-assistance/bridge/inbox/` or `.ai-assistance/bridge/outbox/`).
-
-This includes: editing source files, updating documentation, changing scripts,
-modifying capabilities files, etc.
-
----
-
-## Protocol
-
-### 0. Check for a lock
-
-```bash
-cat .ai-assistance/bridge/LOCK 2>/dev/null || echo "NO_LOCK"
-```
-
-- **No lock:** proceed to step 1
-- **Lock exists, EXPIRES is in the future:** stop. Tell the user:
-  > "Working tree is locked by [AGENT] ([USER]) since [ACQUIRED], working on: [INTENT].
-  > Expires at [EXPIRES]. Please wait or check if the other session is still active."
-- **Lock exists, EXPIRES is in the past:** stale lock — safe to overwrite, proceed to step 1
-
----
-
-### 1. Acquire the lock
-
-Write `.ai-assistance/bridge/LOCK` with full watermark:
-
-```
-AGENT: code
-USER: [git config user.name, lowercased]
-ACQUIRED: [ISO 8601 now]
-EXPIRES: [ISO 8601 now + 30 minutes]
-INTENT: [one sentence — what you are about to change and why]
-FILES: [comma-separated list of files you plan to modify]
-```
-
-Example:
-```
-AGENT: code
-USER: oscar
-ACQUIRED: 2026-06-04T10:00:00Z
-EXPIRES: 2026-06-04T10:30:00Z
-INTENT: Update gitlab-mcp.md with new PAT scopes and rotation info
-FILES: .ai-assistance/integrations/gitlab-mcp.md
-```
-
----
-
-### 2. Check for unstaged changes that overlap with your planned files
-
-```bash
-git status --short
-```
-
-If the working tree is clean, skip to step 3.
-
-If there are unstaged/staged changes, compare them against the files listed in your LOCK:
-
-```bash
-git diff --name-only HEAD
-git diff --cached --name-only
-```
-
-- **No overlap with your FILES:** proceed — the changes are unrelated and won't pollute history
-- **Overlap with one or more of your FILES:** commit the unstaged changes first.
-  Derive the commit message by running `git diff HEAD` on the overlapping files and
-  writing a short imperative summary of what actually changed — do not use a generic
-  message. Format: `wip: <what changed, e.g. "rename .claude to .ai-assistance across scripts">`
-
-```bash
-git add -A
-git commit -m "wip: <derived from actual diff>"
-```
-
-This keeps Code's subsequent commit clean and ensures both sets of changes build
-on the correct base. On a feature branch, `wip:` commits are fine — squash before MR.
-
----
-
-### 3. Apply your changes
-
-Make the intended file edits. Stay within the scope declared in INTENT and FILES
-when you acquired the lock. If scope expands, update the LOCK file before proceeding.
-
----
-
-### 4. Commit your changes
-
-```bash
-git add -A
-git commit -m "[descriptive message — what Code changed and why]"
-```
-
-Commit message should be specific enough that a teammate can understand the change
-without reading the diff. Example:
-```
-docs: update gitlab-mcp.md scopes and rotation info for new PAT (April 2027 expiry)
-```
-
-**Commit authorship — developer only by default:**
-
-Commits are authored by the developer alone (git's `user.name` / `user.email` config).
-Do NOT add `Co-Authored-By: Claude ...` to commit messages unless the developer
-explicitly requests it.
-
-Rationale: the commit history is the developer's professional record. Co-authorship is
-opt-in, not opt-out. If the developer wants to attribute AI involvement, they can add
-it themselves or ask Claude to include it for a specific commit.
-
-Before adding any co-authorship attribution, ask:
-> "Would you like to add AI co-authorship to this commit, or keep it as your commit alone?"
-
-Default answer if not asked: **developer only**.
-
----
-
-### 5. Release the lock
-
-```bash
-rm .ai-assistance/bridge/LOCK
-```
-
----
-
-## Quick reference
-
-```bash
-# 0. Check lock
-cat .ai-assistance/bridge/LOCK 2>/dev/null || echo "NO_LOCK"
-
-# 1. Acquire lock
-cat > .ai-assistance/bridge/LOCK << EOF
-AGENT: code
-USER: oscar
-ACQUIRED: $(date -u +"%Y-%m-%dT%H:%M:%SZ")
-EXPIRES: $(date -u -d "+30 minutes" +"%Y-%m-%dT%H:%M:%SZ" 2>/dev/null || date -u -v+30M +"%Y-%m-%dT%H:%M:%SZ")
-INTENT: <what you are changing>
-FILES: <files>
-EOF
-
-# 2. Check for overlapping unstaged changes
-git diff --name-only HEAD && git diff --cached --name-only
-# If any of those files overlap with your planned FILES → commit them first:
-git add -A && git commit -m "wip: <description of CoWork's in-progress work>"
-# If no overlap → skip, proceed directly
-
-# 3. Apply changes
-# ... make edits ...
-
-# 4. Commit your changes
-git add -A && git commit -m "<descriptive message>"
-
-# 5. Release lock
-rm .ai-assistance/bridge/LOCK
-```
-
----
-
-## Notes
-
-- If Code crashes mid-protocol, the LOCK will expire naturally (30 min timeout)
-- The `wip:` commit prefix signals to teammates that this was an auto-committed
-  in-progress state — safe to squash or amend later
-- This protocol does not apply to bridge task processing (reading inbox, writing outbox)
-  — those are read/write of bridge files only and don't touch the working tree

data/.ai-assistance/scripts/token-logger.js

@@ -1,220 +0,0 @@
-#!/usr/bin/env node
-/**
- * token-logger.js
- *
- * Claude Code Stop hook — fires after every AI response turn.
- * Reads the session transcript, extracts token usage, accumulates weekly totals,
- * and warns when approaching the project's budget allocation.
- *
- * Wired in .claude/settings.json:
- *   "Stop": [{ "type": "command", "command": "node .ai-assistance/scripts/token-logger.js" }]
- *
- * Reads:  stdin (Stop event JSON with session_id, transcript_path, cwd)
- *         .ai-assistance/token-budget.json
- *         .ai-assistance/local/kpi/session-<id>.json  (running session state)
- *         .ai-assistance/local/kpi/weekly-<YYYY-WNN>.json  (weekly totals)
- *
- * Writes: .ai-assistance/local/kpi/session-<id>.json  (updated state)
- *         .ai-assistance/local/kpi/weekly-<YYYY-WNN>.json  (updated totals)
- *         .ai-assistance/local/kpi/sessions-<YYYY-WNN>.jsonl  (completed turns)
- */
-
-const fs   = require("fs");
-const path = require("path");
-const os   = require("os");
-
-// ── Helpers ────────────────────────────────────────────────────────────────
-
-function isoWeek(d) {
-  const jan4 = new Date(d.getFullYear(), 0, 4);
-  const startOfWeek = new Date(jan4);
-  startOfWeek.setDate(jan4.getDate() - ((jan4.getDay() + 6) % 7));
-  const weekNum = Math.ceil(((d - startOfWeek) / 86400000 + 1) / 7);
-  return `${d.getFullYear()}-W${String(weekNum).padStart(2, "0")}`;
-}
-
-function loadJson(p, fallback) {
-  try { return JSON.parse(fs.readFileSync(p, "utf8")); }
-  catch { return fallback; }
-}
-
-function saveJson(p, data) {
-  fs.mkdirSync(path.dirname(p), { recursive: true });
-  fs.writeFileSync(p, JSON.stringify(data, null, 2) + "\n", "utf8");
-}
-
-function appendJsonl(p, obj) {
-  fs.mkdirSync(path.dirname(p), { recursive: true });
-  fs.appendFileSync(p, JSON.stringify(obj) + "\n", "utf8");
-}
-
-// ── Extract token usage from transcript JSONL ──────────────────────────────
-
-function extractUsageFromTranscript(transcriptPath) {
-  if (!transcriptPath || !fs.existsSync(transcriptPath)) return null;
-
-  let inputTokens = 0, outputTokens = 0, cacheReadTokens = 0, cacheCreateTokens = 0;
-  let toolCalls = 0, turns = 0, found = false;
-
-  try {
-    const lines = fs.readFileSync(transcriptPath, "utf8").split("\n").filter(Boolean);
-    for (const line of lines) {
-      try {
-        const entry = JSON.parse(line);
-        // Extract usage from any entry that has it
-        const usage = entry.usage || entry.message?.usage;
-        if (usage) {
-          inputTokens      += usage.input_tokens              || 0;
-          outputTokens     += usage.output_tokens             || 0;
-          cacheReadTokens  += usage.cache_read_input_tokens   || 0;
-          cacheCreateTokens+= usage.cache_creation_input_tokens|| 0;
-          found = true;
-        }
-        // Count tool uses
-        if (entry.type === "tool_use" || entry.tool_name) toolCalls++;
-        // Count assistant turns
-        if (entry.role === "assistant" || entry.type === "assistant") turns++;
-      } catch { /* skip malformed lines */ }
-    }
-  } catch { return null; }
-
-  if (!found) return null;
-  return { inputTokens, outputTokens, cacheReadTokens, cacheCreateTokens, toolCalls, turns };
-}
-
-// ── Estimate tokens when transcript doesn't have usage data ───────────────
-
-function estimateFromTranscript(transcriptPath) {
-  if (!transcriptPath || !fs.existsSync(transcriptPath)) {
-    return { inputTokens: 0, outputTokens: 0, toolCalls: 0, turns: 0, estimated: true };
-  }
-  let inputChars = 0, outputChars = 0, toolCalls = 0, turns = 0;
-  try {
-    const lines = fs.readFileSync(transcriptPath, "utf8").split("\n").filter(Boolean);
-    for (const line of lines) {
-      try {
-        const entry = JSON.parse(line);
-        const content = JSON.stringify(entry.content || entry.text || "");
-        if (entry.role === "user" || entry.type === "user")           { inputChars += content.length; }
-        if (entry.role === "assistant" || entry.type === "assistant") { outputChars += content.length; turns++; }
-        if (entry.type === "tool_use" || entry.tool_name)             { toolCalls++; inputChars += 500 * 4; }
-      } catch { /* skip */ }
-    }
-  } catch {}
-  return {
-    inputTokens:  Math.round(inputChars / 4),
-    outputTokens: Math.round(outputChars / 4),
-    cacheReadTokens: 0, cacheCreateTokens: 0,
-    toolCalls, turns, estimated: true
-  };
-}
-
-// ── Main ───────────────────────────────────────────────────────────────────
-
-async function main() {
-  let event = {};
-  try {
-    const raw = fs.readFileSync("/dev/stdin", "utf8");
-    event = JSON.parse(raw);
-  } catch { /* no stdin or parse error — use empty event */ }
-
-  const cwd            = event.cwd || process.cwd();
-  const sessionId      = event.session_id || `unknown-${Date.now()}`;
-  const transcriptPath = event.transcript_path;
-
-  const budgetFile  = path.join(cwd, ".ai-assistance", "token-budget.json");
-  const kpiDir      = path.join(cwd, ".ai-assistance", "local", "kpi");
-  const weekId      = isoWeek(new Date());
-  const sessionFile = path.join(kpiDir, `session-${sessionId}.json`);
-  const weeklyFile  = path.join(kpiDir, `weekly-${weekId}.json`);
-  const turnLogFile = path.join(kpiDir, `sessions-${weekId}.jsonl`);
-
-  const budget  = loadJson(budgetFile, {});
-  const project = (budget.project?.name || path.basename(cwd));
-  const priority= (budget.project?.priority || "medium");
-  const targetPct = (budget.weekly_quota?.target_utilization_pct || 75) / 100;
-  const warnAt    = (budget.session_logging?.warn_at_pct || 80) / 100;
-
-  // Extract usage from transcript
-  const transcriptUsage = extractUsageFromTranscript(transcriptPath)
-    || estimateFromTranscript(transcriptPath);
-
-  // Load previous session state (accumulate across turns in a session)
-  const prevSession = loadJson(sessionFile, {
-    session_id: sessionId, project, priority,
-    started_at: new Date().toISOString(),
-    week_id: weekId,
-    input_tokens: 0, output_tokens: 0,
-    cache_read_tokens: 0, cache_create_tokens: 0,
-    tool_calls: 0, turns: 0, estimated: false,
-  });
-
-  // Use transcript totals (they accumulate naturally) not deltas
-  const sessionNow = {
-    ...prevSession,
-    input_tokens:       transcriptUsage.inputTokens,
-    output_tokens:      transcriptUsage.outputTokens,
-    cache_read_tokens:  transcriptUsage.cacheReadTokens  || 0,
-    cache_create_tokens:transcriptUsage.cacheCreateTokens || 0,
-    tool_calls:         transcriptUsage.toolCalls,
-    turns:              transcriptUsage.turns,
-    estimated:          transcriptUsage.estimated || false,
-    last_updated_at:    new Date().toISOString(),
-  };
-
-  saveJson(sessionFile, sessionNow);
-
-  // Update weekly totals — replace session contribution (re-compute from sessions)
-  const weekly = loadJson(weeklyFile, { week_id: weekId, projects: {}, total_tokens: 0 });
-  const sessionTotal = sessionNow.input_tokens + sessionNow.output_tokens;
-  const prevContrib  = (weekly.projects[sessionId]?.tokens || 0);
-  weekly.projects[sessionId] = {
-    project, priority, tokens: sessionTotal,
-    tool_calls: sessionNow.tool_calls, turns: sessionNow.turns,
-    updated_at: new Date().toISOString()
-  };
-  weekly.total_tokens = Object.values(weekly.projects).reduce((s, p) => s + p.tokens, 0);
-  saveJson(weeklyFile, weekly);
-
-  // Log the turn to the weekly JSONL (for cross-session analysis)
-  appendJsonl(turnLogFile, {
-    ts: new Date().toISOString(), session_id: sessionId, project, priority, week_id: weekId,
-    turn_tokens: sessionTotal - prevContrib,
-    session_total_tokens: sessionTotal,
-    tool_calls: sessionNow.tool_calls,
-    estimated: sessionNow.estimated,
-  });
-
-  // ── Budget warnings ────────────────────────────────────────────────────
-
-  const totalTokens = budget.weekly_quota?.total_tokens;
-  if (totalTokens) {
-    const usedPct = weekly.total_tokens / totalTokens;
-    const targetTokens = totalTokens * targetPct;
-
-    // Priority-based soft allocation
-    const weights  = budget.project_allocation?.priority_weights || { high: 50, medium: 30, low: 20 };
-    const myWeight = (weights[priority] || 30) / 100;
-    const myBudget = totalTokens * targetPct * myWeight;
-    const myUsed   = Object.values(weekly.projects)
-      .filter(p => p.project === project)
-      .reduce((s, p) => s + p.tokens, 0);
-    const myPct = myBudget > 0 ? myUsed / myBudget : 0;
-
-    if (usedPct >= warnAt) {
-      process.stderr.write(
-        `\n[token-budget] ⚠  Week ${weekId}: ${Math.round(usedPct * 100)}% of quota used` +
-        ` (${weekly.total_tokens.toLocaleString()}/${totalTokens.toLocaleString()} tokens)` +
-        ` — target was ${Math.round(targetPct * 100)}%\n`
-      );
-    }
-    if (myPct >= warnAt) {
-      process.stderr.write(
-        `[token-budget] ⚠  Project "${project}" (${priority}): ${Math.round(myPct * 100)}% of allocation` +
-        ` (${myUsed.toLocaleString()}/${Math.round(myBudget).toLocaleString()} tokens)\n`
-      );
-    }
-  }
-}
-
-main().catch(() => { /* never crash the hook */ });