@pdpp/local-collector 0.1.0-beta.5 → 0.1.0-beta.7

package/dist/local-collector/bin/pdpp-local-collector.js

@@ -1,12 +1,37 @@
 #!/usr/bin/env node
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { basename, dirname, extname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { ALLOW_CUSTOM_COMMAND_ENV, CollectorCustomCommandRefusedError, CollectorUsageError, } from "../src/errors.js";
 import { BUNDLED_CONNECTOR_IDS, COLLECTOR_PROTOCOL_VERSION, COLLECTOR_RUNTIME_CAPABILITIES, LocalDeviceOutbox, enrollCollector, getBundledConnector, isMainModule, runCollectorConnector, } from "../src/runner.js";
 const DEFAULT_QUEUE_PATH = join(dirname(fileURLToPath(import.meta.url)), "..", ".pdpp-data", "collector-runner-queue.json");
 const LOCAL_COLLECTOR_PACKAGE_NAME = "@pdpp/local-collector";
-const LOCAL_COLLECTOR_PACKAGE_VERSION = "0.0.0";
+const LOCAL_COLLECTOR_PACKAGE_VERSION_FALLBACK = "0.0.0";
+export function resolveLocalCollectorPackageVersion(startUrl = import.meta.url) {
+    let current = typeof startUrl === "string" && !startUrl.startsWith("file:")
+        ? dirname(startUrl)
+        : dirname(fileURLToPath(startUrl));
+    for (;;) {
+        const manifestPath = join(current, "package.json");
+        if (existsSync(manifestPath)) {
+            try {
+                const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
+                if (manifest.name === LOCAL_COLLECTOR_PACKAGE_NAME &&
+                    typeof manifest.version === "string" &&
+                    manifest.version) {
+                    return manifest.version;
+                }
+            }
+            catch {
+            }
+        }
+        const parent = dirname(current);
+        if (parent === current) {
+            return LOCAL_COLLECTOR_PACKAGE_VERSION_FALLBACK;
+        }
+        current = parent;
+    }
+}
 const HELP_TEXT = `pdpp-local-collector — PDPP local collector runner.
 
 Ownership: the local device/host supervisor decides when filesystem-class
@@ -153,7 +178,7 @@ export function inspectLocalOutboxStatus(options) {
         },
         package: {
             name: LOCAL_COLLECTOR_PACKAGE_NAME,
-            version: LOCAL_COLLECTOR_PACKAGE_VERSION,
+            version: resolveLocalCollectorPackageVersion(),
         },
         source: {
             connection_id: options.sourceInstanceId ?? null,

package/dist/polyfill-connectors/connectors/claude_code/index.js

@@ -148,6 +148,17 @@ export function observeJsonlFields(obj, obs, forcedSessionId) {
         }
     }
 }
+function updateSessionAccumulatorFromCurrentLine(sessionAccumulators, projectDir, obs, obj, messageCountDelta) {
+    if (!obs.sessionId) {
+        return;
+    }
+    updateSessionAccumulator(sessionAccumulators, projectDir, {
+        ...obs,
+        firstTimestamp: obj.timestamp ?? null,
+        lastTimestamp: obj.timestamp ?? null,
+        messageCount: messageCountDelta,
+    });
+}
 export function isMessageType(type) {
     return type === "user" || type === "assistant";
 }
@@ -357,11 +368,12 @@ async function parseJsonlFile(args) {
                 message: `  ${path}: ${lineCount} lines parsed`,
             });
         }
+        const messageCountBeforeLine = obs.messageCount;
         observeJsonlFields(obj, obs, forcedSessionId);
         await processJsonlLine({ buildOnly, deps: { emitRecord, requested }, obj, obs });
-    }
-    if (buildOnly) {
-        updateSessionAccumulator(sessionAccumulators, projectDir, obs);
+        if (buildOnly) {
+            updateSessionAccumulatorFromCurrentLine(sessionAccumulators, projectDir, obs, obj, obs.messageCount - messageCountBeforeLine);
+        }
     }
     return obs.sessionId;
 }
@@ -732,7 +744,8 @@ if (isMainModule(import.meta.url)) {
             const baseDir = process.env.CLAUDE_CODE_PROJECTS_DIR || join(claudeHome, "projects");
             await assertRequestedClaudeSources({ baseDir, claudeHome, requested });
             const typedState = state;
-            const fileMtimes = streamFileMtimes(typedState, "messages") ?? typedState.file_mtimes ?? {};
+            const messageFileMtimes = streamFileMtimes(typedState, "messages") ?? typedState.file_mtimes ?? {};
+            const sessionFileMtimes = streamFileMtimes(typedState, "sessions") ?? {};
             const skillsMtimes = streamFileMtimes(typedState, "skills") ?? {};
             const slashCommandMtimes = streamFileMtimes(typedState, "slash_commands") ?? {};
             const memoryNoteMtimes = streamFileMtimes(typedState, "memory_notes") ?? {};
@@ -753,15 +766,16 @@ if (isMainModule(import.meta.url)) {
             if (!needsProjects) {
                 return;
             }
-            const newMtimes = { ...fileMtimes };
+            const newMessageFileMtimes = { ...messageFileMtimes };
+            const newSessionFileMtimes = { ...sessionFileMtimes };
             const sessionAccumulators = new Map();
             await scanProjectDirs({
                 baseDir,
                 buildOnly: true,
                 emit,
                 emitRecord,
-                fileMtimes,
-                newMtimes,
+                fileMtimes: sessionFileMtimes,
+                newMtimes: newSessionFileMtimes,
                 memoryNoteMtimes,
                 newMemoryNoteMtimes,
                 requested,
@@ -772,7 +786,7 @@ if (isMainModule(import.meta.url)) {
                 await emit({
                     type: "STATE",
                     stream: "sessions",
-                    cursor: { fetched_at: nowIso() },
+                    cursor: { file_mtimes: newSessionFileMtimes, fetched_at: nowIso() },
                 });
             }
             if (requested.has("memory_notes")) {
@@ -788,8 +802,8 @@ if (isMainModule(import.meta.url)) {
                     buildOnly: false,
                     emit,
                     emitRecord,
-                    fileMtimes,
-                    newMtimes,
+                    fileMtimes: messageFileMtimes,
+                    newMtimes: newMessageFileMtimes,
                     requested,
                     sessionAccumulators,
                 });
@@ -798,7 +812,7 @@ if (isMainModule(import.meta.url)) {
                 await emit({
                     type: "STATE",
                     stream: "messages",
-                    cursor: { file_mtimes: newMtimes, fetched_at: nowIso() },
+                    cursor: { file_mtimes: newMessageFileMtimes, fetched_at: nowIso() },
                 });
             }
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pdpp/local-collector",
-  "version": "0.1.0-beta.5",
+  "version": "0.1.0-beta.7",
   "description": "Publishable local collector runtime for PDPP: filesystem-class connectors (Claude Code, Codex) plus the device-exporter ingest client.",
   "type": "module",
   "private": false,