forkit-connect 0.1.31 → 0.1.32

package/README.md

@@ -123,7 +123,7 @@ Then install the generated tarball into a clean directory:
 mkdir -p /tmp/forkit-connect-smoke
 cd /tmp/forkit-connect-smoke
 npm init -y
-npm install /absolute/path/to/forkit-connect-0.1.24.tgz
+npm install /absolute/path/to/forkit-connect-<version>.tgz
 npx forkit-connect --help
 npx forkit-connect status
 npx forkit-connect inbox

package/dist/v1/service.js

@@ -309,7 +309,8 @@ function canonicalJson(value) {
     return JSON.stringify(canonicalize(value));
 }
 function modelNameFromKey(modelKeyValue) {
-    return String(modelKeyValue || '').split('#')[0]?.trim() || 'unknown';
+    const rawName = String(modelKeyValue || '').split('#')[0]?.trim() || 'unknown';
+    return rawName.startsWith('model:') ? rawName.slice('model:'.length) : rawName;
 }
 function modelDigestFromKey(modelKeyValue) {
     const digest = String(modelKeyValue || '').split('#')[1]?.trim() || '';
@@ -7080,6 +7081,7 @@ class ConnectV1Service {
                 // Don't consume a retry_count increment here — this is a throttle, not a real failure.
                 return;
             }
+            attempted += 1;
             if (!event.passport_gaid) {
                 if (event.event_type === 'connect_runtime_unavailable') {
                     this.stateStore.discardC2Event(event.event_id, 'c2_local_only_runtime_unavailable');
@@ -7169,14 +7171,39 @@ class ConnectV1Service {
             }
         }
         const queuedEvents = dedupedEvents.slice(0, C2_SYNC_BATCH_SIZE);
-        attempted = queuedEvents.length;
-        for (let i = 0; i < queuedEvents.length; i += C2_FLUSH_CONCURRENCY) {
-            // Stop sending once rate-limited for this cycle.
+        const eventsByPassport = new Map();
+        for (const event of queuedEvents) {
+            const groupKey = event.passport_gaid
+                ? `passport:${event.passport_gaid}`
+                : `event:${event.event_id}`;
+            const group = eventsByPassport.get(groupKey) ?? [];
+            group.push(event);
+            eventsByPassport.set(groupKey, group);
+        }
+        // Keep throughput across independent passports, but process each passport
+        // sequentially so a credential/governor halt leaves later events untouched.
+        while (eventsByPassport.size > 0) {
             if (rateLimitedUntilMs !== null && Date.now() < rateLimitedUntilMs) {
                 break;
             }
-            const chunk = queuedEvents.slice(i, i + C2_FLUSH_CONCURRENCY);
-            await Promise.all(chunk.map(processSingleEvent));
+            const round = [];
+            for (const key of [...eventsByPassport.keys()]) {
+                const group = eventsByPassport.get(key);
+                const event = group?.shift();
+                if (event) {
+                    round.push(event);
+                }
+                if (!group || group.length === 0) {
+                    eventsByPassport.delete(key);
+                }
+            }
+            for (let i = 0; i < round.length; i += C2_FLUSH_CONCURRENCY) {
+                if (rateLimitedUntilMs !== null && Date.now() < rateLimitedUntilMs) {
+                    break;
+                }
+                const chunk = round.slice(i, i + C2_FLUSH_CONCURRENCY);
+                await Promise.all(chunk.map(processSingleEvent));
+            }
         }
         const lastSyncAt = attempted > 0 ? nowIso() : state.last_c2_sync_at;
         const lastSyncError = firstError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forkit-connect",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "description": "Forkit Connect Local Engine - The Global AI Governance Fabric",
   "license": "MIT",
   "main": "dist/index.js",
@@ -34,7 +34,6 @@
     "cors": "^2.8.6",
     "express": "^4.19.2",
     "ps-list": "^8.1.1",
-    "uuid": "^10.0.0",
     "ws": "^8.16.0",
     "zod": "^3.22.0"
   },
@@ -43,7 +42,6 @@
     "@types/cors": "^2.8.19",
     "@types/express": "^4.17.21",
     "@types/node": "^20.0.0",
-    "@types/uuid": "^10.0.0",
     "@types/ws": "^8.5.10",
     "typescript": "^5.0.0"
   },