@fnndsc/salsa 3.8.1 → 3.10.0

package/dist/vfs/providers/pacsGrammar.js

@@ -0,0 +1,83 @@
+"use strict";
+/**
+ * @file The PACS VFS folder grammar, both directions.
+ *
+ * Query folders are named `<desc>_qid:<id>[_<user>][_no-hits]`, study
+ * folders `Study_<uid>_<desc>`, series folders `Series_<uid>_<desc>`. This
+ * module owns building those names and parsing them back, so a path a
+ * surface builds is always the path the listing shows.
+ *
+ * Deliberately dependency-free: test mocks forward these functions directly
+ * (via the package's `./pacs-grammar` subpath export) instead of maintaining
+ * copies, so nothing here may import anything.
+ *
+ * @module
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.queryId_extractFromFolder = queryId_extractFromFolder;
+exports.queryLabel_extractFromFolder = queryLabel_extractFromFolder;
+exports.folderUID_get = folderUID_get;
+exports.queryFolderName_build = queryFolderName_build;
+/**
+ * Extracts the numeric query id from a query folder name or any path
+ * containing one.
+ *
+ * @param folder - Folder name or full path carrying a `_qid:<id>` marker.
+ * @returns The query id, or NaN when no marker is present.
+ */
+function queryId_extractFromFolder(folder) {
+    const match = /_qid:(\d+)/.exec(folder);
+    return match ? Number(match[1]) : NaN;
+}
+/**
+ * Extracts the descriptive label of a query folder, the part before its
+ * `_qid:` marker (the id, user, and no-hits suffixes are all dropped).
+ *
+ * @param folder - Query folder name (`<desc>_qid:<id>[_<user>][_no-hits]`).
+ * @returns The label, or the folder unchanged when it carries no marker.
+ */
+function queryLabel_extractFromFolder(folder) {
+    return folder.replace(/_qid:\d+.*$/, "");
+}
+/**
+ * Extracts the UID portion of a study or series folder name
+ * (`<prefix>_<uid>_<label>`).
+ *
+ * @param folder - The folder name.
+ * @param prefix - The expected prefix, `Study` or `Series`.
+ * @returns The UID between the prefix and the first following underscore.
+ */
+function folderUID_get(folder, prefix) {
+    const withoutPrefix = folder.replace(new RegExp(`^${prefix}_`), "");
+    return withoutPrefix.split("_")[0];
+}
+/**
+ * Builds a query folder name: `<desc>_qid:<id>[_<user>][_no-hits]`.
+ *
+ * This is the single naming authority: the listing provider and any surface
+ * that pre-computes a query's path must both use it, otherwise a freshly
+ * created query can be addressed by a name `ls` will never show.
+ *
+ * @param parts - The name's inputs. See QueryFolderNameParts.
+ * @returns The folder name (no leading path).
+ */
+function queryFolderName_build(parts) {
+    const segments = [];
+    for (const [k, v] of Object.entries(parts.queryObj)) {
+        if (v !== undefined && v !== null && String(v).trim().length > 0)
+            segments.push(`${k}:${v}`);
+    }
+    let desc = segments.join("_");
+    if (!desc) {
+        const title = parts.title ?? "";
+        desc = title
+            ? title.replace(/^pacs_query_\d+_\d+$/, "query").replace(/^pacs_query_/, "")
+            : "query";
+        if (!desc)
+            desc = "query";
+    }
+    const userSuffix = parts.username ? `_${parts.username}` : "";
+    const noHitsSuffix = parts.hasResult === false ? "_no-hits" : "";
+    return `${desc}_qid:${parts.queryId}${userSuffix}${noHitsSuffix}`;
+}
+//# sourceMappingURL=pacsGrammar.js.map

package/dist/vfs/providers/pacsGrammar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pacsGrammar.js","sourceRoot":"","sources":["../../../src/vfs/providers/pacsGrammar.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;GAaG;;AASH,8DAGC;AASD,oEAEC;AAUD,sCAGC;AAgCD,sDAgBC;AAlFD;;;;;;GAMG;AACH,SAAgB,yBAAyB,CAAC,MAAc;IACtD,MAAM,KAAK,GAA2B,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAChE,OAAO,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACxC,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,4BAA4B,CAAC,MAAc;IACzD,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;AAC3C,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,aAAa,CAAC,MAAc,EAAE,MAAc;IAC1D,MAAM,aAAa,GAAW,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5E,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,CAAC;AAsBD;;;;;;;;;GASG;AACH,SAAgB,qBAAqB,CAAC,KAA2B;IAC/D,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpD,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;YAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/F,CAAC;IACD,IAAI,IAAI,GAAW,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,KAAK,GAAW,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;QACxC,IAAI,GAAG,KAAK;YACV,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;YAC5E,CAAC,CAAC,OAAO,CAAC;QACZ,IAAI,CAAC,IAAI;YAAE,IAAI,GAAG,OAAO,CAAC;IAC5B,CAAC;IACD,MAAM,UAAU,GAAW,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACtE,MAAM,YAAY,GAAW,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IACzE,OAAO,GAAG,IAAI,QAAQ,KAAK,CAAC,OAAO,GAAG,UAAU,GAAG,YAAY,EAAE,CAAC;AACpE,CAAC"}

package/dist/vfs/providers/pacsHelpers.d.ts

@@ -14,55 +14,23 @@
  */
 import { Result } from "@fnndsc/cumin";
 export { tag_extractValue, studies_extractFromDecoded, series_extractFromStudy, study_findByUID, series_findByUID, } from "@fnndsc/cumin";
-export declare function path_normalize(pathStr: string): string;
-export declare function queryId_extractFromFolder(folder: string): number;
 /**
- * Extracts the descriptive label of a query folder, the part before its
- * `_qid:` marker (the id, user, and no-hits suffixes are all dropped).
+ * Normalizes a VFS path: guarantees a leading slash and strips one trailing
+ * slash (the root path keeps its single slash).
  *
- * @param folder - Query folder name (`<desc>_qid:<id>[_<user>][_no-hits]`).
- * @returns The label, or the folder unchanged when it carries no marker.
+ * @param pathStr - Raw path string.
+ * @returns The normalized absolute path.
  */
-export declare function queryLabel_extractFromFolder(folder: string): string;
-/**
- * Extracts the UID portion of a study or series folder name
- * (`<prefix>_<uid>_<label>`).
- *
- * @param folder - The folder name.
- * @param prefix - The expected prefix, `Study` or `Series`.
- * @returns The UID between the prefix and the first following underscore.
- */
-export declare function folderUID_get(folder: string, prefix: string): string;
-/**
- * Everything that determines a query folder's name.
- *
- * @property queryId - The query's numeric id.
- * @property queryObj - The query's key-value search terms; blank values are
- *   skipped.
- * @property title - The query record's title, used as the description when
- *   queryObj yields nothing.
- * @property username - Owning username, appended as `_<user>` when present.
- * @property hasResult - Whether the query holds a result payload; false
- *   appends the `_no-hits` suffix. Defaults to true.
- */
-export interface QueryFolderNameParts {
-    queryId: number | string;
-    queryObj: Record<string, unknown>;
-    title?: string;
-    username?: string;
-    hasResult?: boolean;
-}
+export declare function path_normalize(pathStr: string): string;
+export { queryId_extractFromFolder, queryLabel_extractFromFolder, folderUID_get, queryFolderName_build, } from "./pacsGrammar.js";
+export type { QueryFolderNameParts } from "./pacsGrammar.js";
 /**
- * Builds a query folder name: `<desc>_qid:<id>[_<user>][_no-hits]`.
- *
- * This is the single naming authority: the listing provider and any surface
- * that pre-computes a query's path must both use it, otherwise a freshly
- * created query can be addressed by a name `ls` will never show.
+ * Parses a `cp` source path into its study, optional series, and query id.
  *
- * @param parts - The name's inputs. See QueryFolderNameParts.
- * @returns The folder name (no leading path).
+ * @param src - Source path naming a Study or Series directory under a query.
+ * @returns The parsed identifiers, or Err with a rendered reason on the
+ *   error stack when the path is not a copyable PACS location.
  */
-export declare function queryFolderName_build(parts: QueryFolderNameParts): string;
 export declare function cpSrc_parse(src: string): Result<{
     studyUID: string;
     seriesUID?: string;

package/dist/vfs/providers/pacsHelpers.js

@@ -1,11 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.series_findByUID = exports.study_findByUID = exports.series_extractFromStudy = exports.studies_extractFromDecoded = exports.tag_extractValue = void 0;
+exports.queryFolderName_build = exports.folderUID_get = exports.queryLabel_extractFromFolder = exports.queryId_extractFromFolder = exports.series_findByUID = exports.study_findByUID = exports.series_extractFromStudy = exports.studies_extractFromDecoded = exports.tag_extractValue = void 0;
 exports.path_normalize = path_normalize;
-exports.queryId_extractFromFolder = queryId_extractFromFolder;
-exports.queryLabel_extractFromFolder = queryLabel_extractFromFolder;
-exports.folderUID_get = folderUID_get;
-exports.queryFolderName_build = queryFolderName_build;
 exports.cpSrc_parse = cpSrc_parse;
 /**
  * @file Pure helpers for the PACS VFS provider.
@@ -22,73 +18,38 @@ exports.cpSrc_parse = cpSrc_parse;
  * @module
  */
 const cumin_1 = require("@fnndsc/cumin");
+const pacsGrammar_js_1 = require("./pacsGrammar.js");
 var cumin_2 = require("@fnndsc/cumin");
 Object.defineProperty(exports, "tag_extractValue", { enumerable: true, get: function () { return cumin_2.tag_extractValue; } });
 Object.defineProperty(exports, "studies_extractFromDecoded", { enumerable: true, get: function () { return cumin_2.studies_extractFromDecoded; } });
 Object.defineProperty(exports, "series_extractFromStudy", { enumerable: true, get: function () { return cumin_2.series_extractFromStudy; } });
 Object.defineProperty(exports, "study_findByUID", { enumerable: true, get: function () { return cumin_2.study_findByUID; } });
 Object.defineProperty(exports, "series_findByUID", { enumerable: true, get: function () { return cumin_2.series_findByUID; } });
+/**
+ * Normalizes a VFS path: guarantees a leading slash and strips one trailing
+ * slash (the root path keeps its single slash).
+ *
+ * @param pathStr - Raw path string.
+ * @returns The normalized absolute path.
+ */
 function path_normalize(pathStr) {
     let p = pathStr.startsWith("/") ? pathStr : "/" + pathStr;
     if (p.length > 1 && p.endsWith("/"))
         p = p.slice(0, -1);
     return p;
 }
-function queryId_extractFromFolder(folder) {
-    const match = /_qid:(\d+)/.exec(folder);
-    return match ? Number(match[1]) : NaN;
-}
-/**
- * Extracts the descriptive label of a query folder, the part before its
- * `_qid:` marker (the id, user, and no-hits suffixes are all dropped).
- *
- * @param folder - Query folder name (`<desc>_qid:<id>[_<user>][_no-hits]`).
- * @returns The label, or the folder unchanged when it carries no marker.
- */
-function queryLabel_extractFromFolder(folder) {
-    return folder.replace(/_qid:\d+.*$/, "");
-}
+var pacsGrammar_js_2 = require("./pacsGrammar.js");
+Object.defineProperty(exports, "queryId_extractFromFolder", { enumerable: true, get: function () { return pacsGrammar_js_2.queryId_extractFromFolder; } });
+Object.defineProperty(exports, "queryLabel_extractFromFolder", { enumerable: true, get: function () { return pacsGrammar_js_2.queryLabel_extractFromFolder; } });
+Object.defineProperty(exports, "folderUID_get", { enumerable: true, get: function () { return pacsGrammar_js_2.folderUID_get; } });
+Object.defineProperty(exports, "queryFolderName_build", { enumerable: true, get: function () { return pacsGrammar_js_2.queryFolderName_build; } });
 /**
- * Extracts the UID portion of a study or series folder name
- * (`<prefix>_<uid>_<label>`).
+ * Parses a `cp` source path into its study, optional series, and query id.
  *
- * @param folder - The folder name.
- * @param prefix - The expected prefix, `Study` or `Series`.
- * @returns The UID between the prefix and the first following underscore.
+ * @param src - Source path naming a Study or Series directory under a query.
+ * @returns The parsed identifiers, or Err with a rendered reason on the
+ *   error stack when the path is not a copyable PACS location.
  */
-function folderUID_get(folder, prefix) {
-    const withoutPrefix = folder.replace(new RegExp(`^${prefix}_`), "");
-    return withoutPrefix.split("_")[0];
-}
-/**
- * Builds a query folder name: `<desc>_qid:<id>[_<user>][_no-hits]`.
- *
- * This is the single naming authority: the listing provider and any surface
- * that pre-computes a query's path must both use it, otherwise a freshly
- * created query can be addressed by a name `ls` will never show.
- *
- * @param parts - The name's inputs. See QueryFolderNameParts.
- * @returns The folder name (no leading path).
- */
-function queryFolderName_build(parts) {
-    const segments = [];
-    for (const [k, v] of Object.entries(parts.queryObj)) {
-        if (v !== undefined && v !== null && String(v).trim().length > 0)
-            segments.push(`${k}:${v}`);
-    }
-    let desc = segments.join("_");
-    if (!desc) {
-        const title = parts.title ?? "";
-        desc = title
-            ? title.replace(/^pacs_query_\d+_\d+$/, "query").replace(/^pacs_query_/, "")
-            : "query";
-        if (!desc)
-            desc = "query";
-    }
-    const userSuffix = parts.username ? `_${parts.username}` : "";
-    const noHitsSuffix = parts.hasResult === false ? "_no-hits" : "";
-    return `${desc}_qid:${parts.queryId}${userSuffix}${noHitsSuffix}`;
-}
 function cpSrc_parse(src) {
     const absolutePath = src.startsWith("/") ? src : "/" + src;
     const parts = absolutePath.split("/").filter(Boolean);
@@ -105,12 +66,12 @@ function cpSrc_parse(src) {
         cumin_1.errorStack.stack_push("error", `cp: Invalid PACS Study folder format: '${studyFolder}'`);
         return (0, cumin_1.Err)();
     }
-    const studyUID = folderUID_get(studyFolder, "Study");
+    const studyUID = (0, pacsGrammar_js_1.folderUID_get)(studyFolder, "Study");
     let seriesUID;
     if (parts.length >= queryIdx + 3 && parts[queryIdx + 2].startsWith("Series_")) {
-        seriesUID = folderUID_get(parts[queryIdx + 2], "Series");
+        seriesUID = (0, pacsGrammar_js_1.folderUID_get)(parts[queryIdx + 2], "Series");
     }
-    const queryId = queryId_extractFromFolder(parts[queryIdx]);
+    const queryId = (0, pacsGrammar_js_1.queryId_extractFromFolder)(parts[queryIdx]);
     if (Number.isNaN(queryId)) {
         cumin_1.errorStack.stack_push("error", `cp: Invalid query ID in path '${src}'`);
         return (0, cumin_1.Err)();

package/dist/vfs/providers/pacsHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"pacsHelpers.js","sourceRoot":"","sources":["../../../src/vfs/providers/pacsHelpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pacsHelpers.js","sourceRoot":"","sources":["../../../src/vfs/providers/pacsHelpers.ts"],"names":[],"mappings":";;;AAgCA,wCAIC;AAiBD,kCAiCC;AAtFD;;;;;;;;;;;;;GAaG;AACH,yCAA4D;AAC5D,qDAA4E;AAE5E,uCAMuB;AALrB,yGAAA,gBAAgB,OAAA;AAChB,mHAAA,0BAA0B,OAAA;AAC1B,gHAAA,uBAAuB,OAAA;AACvB,wGAAA,eAAe,OAAA;AACf,yGAAA,gBAAgB,OAAA;AAGlB;;;;;;GAMG;AACH,SAAgB,cAAc,CAAC,OAAe;IAC5C,IAAI,CAAC,GAAW,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,OAAO,CAAC;IAClE,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACxD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,mDAK0B;AAJxB,2HAAA,yBAAyB,OAAA;AACzB,8HAAA,4BAA4B,OAAA;AAC5B,+GAAA,aAAa,OAAA;AACb,uHAAA,qBAAqB,OAAA;AAIvB;;;;;;GAMG;AACH,SAAgB,WAAW,CAAC,GAAW;IACrC,MAAM,YAAY,GAAW,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC;IACnE,MAAM,KAAK,GAAa,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEhE,yEAAyE;IACzE,2EAA2E;IAC3E,0DAA0D;IAC1D,MAAM,QAAQ,GAAW,KAAK,CAAC,SAAS,CAAC,CAAC,IAAY,EAAW,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3F,IAAI,QAAQ,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,QAAQ,GAAG,CAAC,EAAE,CAAC;QACnD,kBAAU,CAAC,UAAU,CAAC,OAAO,EAAE,qBAAqB,GAAG,iEAAiE,CAAC,CAAC;QAC1H,OAAO,IAAA,WAAG,GAAE,CAAC;IACf,CAAC;IAED,MAAM,WAAW,GAAW,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;IAChD,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtC,kBAAU,CAAC,UAAU,CAAC,OAAO,EAAE,0CAA0C,WAAW,GAAG,CAAC,CAAC;QACzF,OAAO,IAAA,WAAG,GAAE,CAAC;IACf,CAAC;IAED,MAAM,QAAQ,GAAW,IAAA,8BAAa,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAE7D,IAAI,SAA6B,CAAC;IAClC,IAAI,KAAK,CAAC,MAAM,IAAI,QAAQ,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9E,SAAS,GAAG,IAAA,8BAAa,EAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,OAAO,GAAW,IAAA,0CAAyB,EAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnE,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,kBAAU,CAAC,UAAU,CAAC,OAAO,EAAE,iCAAiC,GAAG,GAAG,CAAC,CAAC;QACxE,OAAO,IAAA,WAAG,GAAE,CAAC;IACf,CAAC;IAED,OAAO,IAAA,UAAE,EAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;AAC9C,CAAC"}

package/dist/vfs/providers/proc.d.ts

@@ -37,6 +37,12 @@ export declare function procPath_parse(pathStr: string): {
     feedID: number | null;
     instanceID: number | null;
     virtualFile: string | null;
+    /**
+     * Set when the path descends THROUGH an instance's `data` link: the
+     * portion after `data`, '' for the link itself. Everything under the
+     * link belongs to the link's CFS target, not to `/proc`.
+     */
+    dataRemainder: string | null;
 };
 /**
  * VFS provider exposing running jobs and feeds under the /proc namespace.
@@ -56,6 +62,14 @@ export declare class ProcVfsProvider implements VFSProvider {
         sort?: 'name' | 'size' | 'date' | 'owner';
         reverse?: boolean;
     }): Promise<Result<VFSItem[]>>;
+    /**
+     * Binary bytes exist only under the `data` link (an image in a job's
+     * output space); everything else in `/proc` is synthesized text.
+     *
+     * @param pathStr - Absolute `/proc/jobs/.../data/...` path.
+     * @returns The target file's bytes.
+     */
+    readBinary(pathStr: string): Promise<Result<Buffer>>;
     read(pathStr: string): Promise<Result<string>>;
     rm(pathStr: string, _options?: {
         recursive?: boolean;

package/dist/vfs/providers/proc.js

@@ -28,6 +28,8 @@ exports.procTopology_await = procTopology_await;
 exports.procCache_refresh = procCache_refresh;
 const cumin_1 = require("@fnndsc/cumin");
 const index_js_1 = require("../../jobs/index.js");
+const feedJoins_js_1 = require("../../dag/feedJoins.js");
+const packages_js_1 = require("../../pipelines/packages.js");
 /** Virtual filenames inside each instance directory. */
 const INSTANCE_FILES = new Set(['status', 'params', 'log', 'data']);
 /** Virtual filenames inside each feed directory. */
@@ -94,6 +96,14 @@ async function cache_ensure() {
  * Loads instance topology for a single feed.
  * Uses in-flight map to prevent duplicate API calls.
  */
+/** Pulls the execution metrics a CUBE list row carries, defined-only. */
+function instanceMetrics_fromRow(inst) {
+    return {
+        ...(typeof inst.start_date === 'string' ? { startedAt: inst.start_date } : {}),
+        ...(typeof inst.end_date === 'string' ? { finishedAt: inst.end_date } : {}),
+        ...(typeof inst.size === 'number' ? { outputBytes: inst.size } : {}),
+    };
+}
 async function feedInstances_load(feedID) {
     const cache = (0, cumin_1.procCache_get)();
     const client = await cumin_1.chrisConnection.client_get();
@@ -117,6 +127,7 @@ async function feedInstances_load(feedID) {
             params: null,
             outputPath: outputPath_normalize(inst.output_path) ?? undefined,
             status: String(inst.status ?? 'unknown'),
+            ...instanceMetrics_fromRow(inst),
         });
     }
     cache.topologyLoaded_mark(feedID);
@@ -169,11 +180,26 @@ function procPath_parse(pathStr) {
     let feedID = null;
     let instanceID = null;
     let virtualFile = null;
+    let dataRemainder = null;
     if (parts.length >= 1) {
         const feedMatch = parts[0].match(/^feed_(\d+)$/);
         if (feedMatch)
             feedID = parseInt(feedMatch[1], 10);
     }
+    // A `data` segment directly after an instance segment starts the link's
+    // subtree: the instance is the one before it, whatever follows is the
+    // remainder inside the CFS target.
+    for (let index = 2; index < parts.length; index++) {
+        if (parts[index] !== 'data')
+            continue;
+        const instMatch = parts[index - 1].match(/_(\d+)$/);
+        if (!instMatch)
+            continue;
+        instanceID = parseInt(instMatch[1], 10);
+        virtualFile = 'data';
+        dataRemainder = parts.slice(index + 1).join('/');
+        return { feedID, instanceID, virtualFile, dataRemainder };
+    }
     if (parts.length >= 2) {
         const lastPart = parts[parts.length - 1];
         if (FEED_FILES.has(lastPart) || INSTANCE_FILES.has(lastPart)) {
@@ -190,7 +216,7 @@ function procPath_parse(pathStr) {
                 instanceID = parseInt(instMatch[1], 10);
         }
     }
-    return { feedID, instanceID, virtualFile };
+    return { feedID, instanceID, virtualFile, dataRemainder };
 }
 /** Formats instance params as key=value lines. */
 function params_render(inst) {
@@ -218,6 +244,21 @@ function outputPath_normalize(value) {
  * @param instanceID - Plugin-instance ID whose output path is needed.
  * @returns Absolute output path, or null when CUBE has not recorded one.
  */
+/**
+ * Resolves a path inside an instance's `data` link to its CFS target.
+ *
+ * @param instanceID - The instance whose output space the path enters.
+ * @param remainder - The path below `data`, '' for the link itself.
+ * @returns The absolute CFS path, or Err when the job has no output space.
+ */
+async function dataTarget_resolve(instanceID, remainder) {
+    const outputPath = await instanceOutputPath_ensure(instanceID);
+    if (!outputPath) {
+        cumin_1.errorStack.stack_push('error', `No CFS output path is available for job ${instanceID}`);
+        return (0, cumin_1.Err)();
+    }
+    return (0, cumin_1.Ok)(remainder === '' ? outputPath : `${outputPath}/${remainder}`);
+}
 async function instanceOutputPath_ensure(instanceID) {
     const cache = (0, cumin_1.procCache_get)();
     const inst = cache.instance_get(instanceID);
@@ -317,7 +358,17 @@ class ProcVfsProvider {
             });
             return (0, cumin_1.Ok)(items);
         }
-        const { feedID, instanceID } = procPath_parse(clean);
+        const { feedID, instanceID, virtualFile, dataRemainder } = procPath_parse(clean);
+        // Anything under an instance's `data` link belongs to the link's CFS
+        // target: resolve and delegate, so `ls .../data` (and deeper) shows the
+        // target's real contents instead of silently re-listing the instance.
+        if (instanceID !== null && virtualFile === 'data' && dataRemainder !== null) {
+            const target = await dataTarget_resolve(instanceID, dataRemainder);
+            if (!target.ok)
+                return (0, cumin_1.Err)();
+            const { vfsDispatcher } = await import('../dispatcher.js');
+            return vfsDispatcher.list(target.value, _options);
+        }
         // /proc/jobs/feed_N — list root instances + feed virtual files
         if (feedID !== null && instanceID === null) {
             const wasLoaded = cache.topologyLoaded_has(feedID);
@@ -391,11 +442,40 @@ class ProcVfsProvider {
         }
         return (0, cumin_1.Ok)([]);
     }
+    /**
+     * Binary bytes exist only under the `data` link (an image in a job's
+     * output space); everything else in `/proc` is synthesized text.
+     *
+     * @param pathStr - Absolute `/proc/jobs/.../data/...` path.
+     * @returns The target file's bytes.
+     */
+    async readBinary(pathStr) {
+        await cache_ensure();
+        const clean = pathStr.replace(/\/$/, '');
+        const { instanceID, virtualFile, dataRemainder } = procPath_parse(clean);
+        if (instanceID === null || virtualFile !== 'data' || dataRemainder === null || dataRemainder === '') {
+            cumin_1.errorStack.stack_push('error', `${pathStr} is not a binary file.`);
+            return (0, cumin_1.Err)();
+        }
+        const target = await dataTarget_resolve(instanceID, dataRemainder);
+        if (!target.ok)
+            return (0, cumin_1.Err)();
+        const { vfsDispatcher } = await import('../dispatcher.js');
+        return vfsDispatcher.readBinary(target.value);
+    }
     async read(pathStr) {
         await cache_ensure();
         const cache = (0, cumin_1.procCache_get)();
         const clean = pathStr.replace(/\/$/, '');
-        const { feedID, instanceID, virtualFile } = procPath_parse(clean);
+        const { feedID, instanceID, virtualFile, dataRemainder } = procPath_parse(clean);
+        // A file under the `data` link is the CFS target's file.
+        if (instanceID !== null && virtualFile === 'data' && dataRemainder !== null && dataRemainder !== '') {
+            const target = await dataTarget_resolve(instanceID, dataRemainder);
+            if (!target.ok)
+                return (0, cumin_1.Err)();
+            const { vfsDispatcher } = await import('../dispatcher.js');
+            return vfsDispatcher.read(target.value);
+        }
         // Feed-level virtual files
         if (feedID !== null && instanceID === null && virtualFile !== null) {
             const feed = cache.feed_get(feedID);
@@ -556,6 +636,7 @@ async function feedStatus_refresh(feedID) {
     for await (const step of (0, cumin_1.listPages_walk)((offset, limit) => (0, cumin_1.pluginInstancesPage_get)(client, { feed_id: feedID, limit, offset }), { pageSize: PAGE })) {
         for (const inst of step.items) {
             cache.status_update(Number(inst.id), String(inst.status ?? 'unknown'));
+            cache.instanceMetrics_set(Number(inst.id), instanceMetrics_fromRow(inst));
         }
     }
 }
@@ -606,6 +687,7 @@ async function procTopology_run(state) {
                 params: null,
                 outputPath: outputPath_normalize(inst.output_path) ?? undefined,
                 status: String(inst.status ?? 'unknown'),
+                ...instanceMetrics_fromRow(inst),
             });
             state.seenInstanceIDs.add(instanceID);
             state.seenFeedIDs.add(feedID);
@@ -655,6 +737,7 @@ function procTopology_start(state) {
         if ((0, cumin_1.procCache_get)().warmupComplete) {
             procTopologyFailure = undefined;
             procTopologyResumeState = null;
+            procSettlementTails_run();
         }
         else {
             procTopologyFailure = 'the topology sweep ended before the index completed';
@@ -668,6 +751,17 @@ function procTopology_start(state) {
     });
     return sweep;
 }
+/**
+ * Kicks the quiet settlement tails once the topology index is complete:
+ * every unresolved `ts` join resolves in the background (so first diagrams
+ * are pure cache, and the checkpoint persists them), and the pipeline
+ * package store sweeps unseen registered pipelines. Both are best-effort —
+ * a failure leaves the lazy paths intact.
+ */
+function procSettlementTails_run() {
+    void (0, feedJoins_js_1.procJoins_sweep)().catch(() => { });
+    void (0, packages_js_1.pipelinePackages_sweep)().catch(() => { });
+}
 /**
  * Runs a feed-scoped topology reconciliation selected after checkpoint restore.
  *
@@ -680,6 +774,7 @@ async function procTopologyScoped_run(feedIDs) {
     for (const feedID of feedIDs)
         await procCache_refresh(feedID);
     cache.warmup_complete();
+    procSettlementTails_run();
 }
 /**
  * Starts one scoped reconciliation and retains its targets for `proc retry`.