datagrok-tools 6.7.1 → 6.7.2

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> datagrok-tools@6.7.1 build /home/runner/work/public/public/tools
+> datagrok-tools@6.7.2 build /home/runner/work/public/public/tools
 > node build.js
 
 Successfully compiled 51 files with Babel.

package/CHANGELOG.md

@@ -1,12 +1,17 @@
 # Datagrok-tools changelog
 
-## 6.7.0 (WIP)
+## 6.7.2 (WIP)
+
+* `grok publish` marks a bundled package for servers older than 1.28.0, which detect one only by a `webpack.config.js` in the archive; the marker is generated at publish time and never written to the package folder.
+
+## 6.7.1 (2026-09-15)
 
 * `grok login <server>` — keypair authentication, the replacement for the developer key. Generates an EC P-256 key, registers only its public half (in the browser, or with a one-shot `--code` from Profile > Public keys...), and keeps the private half in `~/.grok/keys/<alias>.json`. Logging in signs a server-issued nonce, so nothing reusable crosses the wire; keys can carry an expiry (`--expires`) and are revoked one at a time. `grok publish`, `grok test`, `grok stresstest` and `grok s` use it automatically whenever one is configured for the server, and fall back to the developer key otherwise. For CI, `GROK_PRIVATE_KEY` holds the private JWK (raw or base64) instead of a config file. Needs a server from 1.28 on; see https://datagrok.ai/help/govern/access-control/keypair-authentication
 * `grok s token` — prints a session token for the configured server, so shell scripts stop curling `/users/login/dev` with a long-lived key.
 * `grok config add` — `--key` is now optional: a server reached with a keypair has no developer key to record.
 * Against a server older than 1.28 — which has no keypair endpoints and refuses their paths before routing — the CLI names the version needed instead of reporting a bare 401, and falls back to the developer key when one is still configured for that server.
 * `grok login` reports its progress step by step (spinner on a terminal, one line per step in a log), including while it waits for the browser approval.
+* `grok s push/migrate` — a migrated entity is stamped in its `metaParams` with `migrated_from` (the source stand URL) and `migrated_on`, so on the target it is clear the entity came from another stand. Written wherever the entity already carries `metaParams` (as `sync_id` is) and stripped before the idempotency comparison, so a re-push of an unchanged entity still reads as identical.
 
 ## 6.6.0 (2026-09-13)
 

package/bin/commands/publish.js

@@ -4,6 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.BUNDLE_MARKER_NAME = exports.BUNDLE_MARKER = void 0;
+exports.predatesBundleDetection = predatesBundleDetection;
 exports.processPackage = processPackage;
 exports.publish = publish;
 var _archiver = _interopRequireDefault(require("archiver"));
@@ -487,6 +489,21 @@ async function fallbackImage(img, host, devKey, registry, version, contentHash)
     requestedVersion: img.imageTag
   };
 }
+const BUNDLE_MARKER_NAME = exports.BUNDLE_MARKER_NAME = 'webpack.config.js';
+const BUNDLE_MARKER = exports.BUNDLE_MARKER = '// Generated by `grok publish` for servers before 1.28.0, which detect a ' + 'bundled\n// package by this file. The bundle itself is built by @datagrok/build-config.\nmodule.exports = {};\n';
+function predatesBundleDetection(version) {
+  const [major, minor, patch] = (version ?? '').split('.').map(Number);
+  if ([major, minor, patch].some(isNaN)) return true;
+  return major < 1 || major === 1 && minor < 28;
+}
+async function serverPredatesBundleDetection(host) {
+  try {
+    const resp = await (0, _nodeFetch.default)(`${host}/info/server`);
+    return predatesBundleDetection((await resp.json())?.Version);
+  } catch {
+    return true;
+  }
+}
 async function processPackage(debug, rebuild, host, devKey, packageName, dropDb, suffix, hostAlias, registry, rebuildDocker, skipDockerRebuild) {
   // Validate server connectivity and dev key
   let timestamps = {};
@@ -612,6 +629,13 @@ async function processPackage(debug, rebuild, host, devKey, packageName, dropDb,
     if (userInfo) dockerVersion = userInfo.login;
   }
   await processDockerImages(packageName, dockerVersion, registry, devKey, host, rebuildDocker ?? false, zip, localTimestamps, debug, skipDockerRebuild ?? false, generatedDockerDirs);
+  const bundledWithoutMarker = !rebuild && _fs.default.existsSync('dist/package.js') && !_fs.default.existsSync(BUNDLE_MARKER_NAME);
+  if (bundledWithoutMarker && (await serverPredatesBundleDetection(host))) {
+    zip.append(BUNDLE_MARKER, {
+      name: BUNDLE_MARKER_NAME
+    });
+    localTimestamps[BUNDLE_MARKER_NAME] = new Date().toUTCString();
+  }
   zip.append(JSON.stringify(localTimestamps), {
     name: 'timestamps.json'
   });

package/bin/utils/migrate/bundle.js

@@ -35,8 +35,12 @@ function normalize(type, json) {
   if (copy.package) copy.package = {
     id: copy.package.id
   };
-  // The stamp is written by the pusher, so it must not make an unchanged entity look different.
-  if (copy.metaParams) delete copy.metaParams.sync_id;
+  // The stamps are written by the pusher, so they must not make an unchanged entity look different.
+  if (copy.metaParams) {
+    delete copy.metaParams.sync_id;
+    delete copy.metaParams.migrated_from;
+    delete copy.metaParams.migrated_on;
+  }
   _registry.TYPES[type]?.strip?.(copy);
   return sortKeys(copy);
 }

package/bin/utils/migrate/bundle.ts

@@ -43,9 +43,12 @@ export function normalize(type: string, json: any): any {
     delete copy[k];
   if (copy.package)
     copy.package = {id: copy.package.id};
-  // The stamp is written by the pusher, so it must not make an unchanged entity look different.
-  if (copy.metaParams)
+  // The stamps are written by the pusher, so they must not make an unchanged entity look different.
+  if (copy.metaParams) {
     delete copy.metaParams.sync_id;
+    delete copy.metaParams.migrated_from;
+    delete copy.metaParams.migrated_on;
+  }
   TYPES[type]?.strip?.(copy);
   return sortKeys(copy);
 }

package/bin/utils/migrate/pusher.js

@@ -433,7 +433,14 @@ async function saveOne(dapi, bundle, op, rows, idmap, deferred, missing) {
   const spec = _registry.TYPES[op.type];
   const payload = (0, _bundle.stripPrivate)(JSON.parse(JSON.stringify(op.json)));
   const targetId = payload.id ?? op.id;
-  if (payload.metaParams && typeof payload.metaParams === 'object') payload.metaParams.sync_id = op.id;
+  if (payload.metaParams && typeof payload.metaParams === 'object') {
+    payload.metaParams.sync_id = op.id;
+    const from = bundle.manifest?.source?.url;
+    if (from) {
+      payload.metaParams.migrated_from = from;
+      payload.metaParams.migrated_on = new Date().toISOString();
+    }
+  }
 
   // The server encrypts and masks password-class parameters itself, so target-side
   // secrets go in as plain parameters and never touch the bundle.

package/bin/utils/migrate/pusher.ts

@@ -378,8 +378,14 @@ async function saveOne(dapi: NodeDapi, bundle: Bundle, op: Op, rows: Row[], idma
   const spec = TYPES[op.type];
   const payload = stripPrivate(JSON.parse(JSON.stringify(op.json)));
   const targetId = payload.id ?? op.id;
-  if (payload.metaParams && typeof payload.metaParams === 'object')
+  if (payload.metaParams && typeof payload.metaParams === 'object') {
     payload.metaParams.sync_id = op.id;
+    const from = bundle.manifest?.source?.url;
+    if (from) {
+      payload.metaParams.migrated_from = from;
+      payload.metaParams.migrated_on = new Date().toISOString();
+    }
+  }
 
   // The server encrypts and masks password-class parameters itself, so target-side
   // secrets go in as plain parameters and never touch the bundle.

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/datagrok-ai/public.git"
   },
-  "version": "6.7.1",
+  "version": "6.7.2",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {