datagrok-tools 6.0.5 → 6.0.7

package/.devcontainer/entrypoint.sh

@@ -29,17 +29,17 @@ else
   else
     BRANCH=$(resolve_branch "${DG_VERSION:-latest}")
   fi
-  # Sparse checkout: only fetch dirs needed for package context (js-api, libraries, help, packages)
-  # plus root files (CLAUDE.md, .claude/, etc.). Much faster than a full clone.
+  # Sparse checkout (cone mode) with partial clone: only fetch js-api, libraries, and
+  # ApiSamples. Cone mode integrates with --filter=blob:none so the server only sends
+  # blobs for the included directories (~3 MB vs 1.67 GB for the full tree).
   sparse_clone() {
     local branch="$1"
     # Use init+fetch instead of clone to handle pre-existing directories (e.g. mount points)
     git init "$PUBLIC_DIR" \
       && git -C "$PUBLIC_DIR" remote add origin "$REPO" \
-      && git -C "$PUBLIC_DIR" sparse-checkout set --no-cone \
-           '/*' '!connectors/' '!docker/' '!docusaurus/' '!docusaurus-static/' \
-           '!environments/' '!hooks/' '!misc/' 'python-api/' '!datagrok-celery-task/' \
-           '/js-api/**' '/libraries/**' '/packages/**' \
+      && git -C "$PUBLIC_DIR" config remote.origin.promisor true \
+      && git -C "$PUBLIC_DIR" config remote.origin.partialclonefilter blob:none \
+      && git -C "$PUBLIC_DIR" sparse-checkout set --cone js-api libraries packages/ApiSamples \
       && git -C "$PUBLIC_DIR" fetch --depth 1 --filter=blob:none origin "$branch" \
       && git -C "$PUBLIC_DIR" checkout -B "$branch" FETCH_HEAD
   }

package/bin/commands/claude.js

@@ -333,6 +333,11 @@ function writeProjectFiles(taskKey, args, worktreeRoot, dgPort) {
   // Resolve Docker socket path
   const dockerSock = process.platform === 'win32' ? '//var/run/docker.sock' : '/var/run/docker.sock';
 
+  // Resolve entrypoint.sh path — bind-mount from repo so fixes take effect without image rebuild
+  const entrypointPath = _path.default.resolve(__dirname, '..', '..', '.devcontainer', 'entrypoint.sh');
+  const hasLocalEntrypoint = _fs.default.existsSync(entrypointPath);
+  if (!hasLocalEntrypoint) color.warn('Local entrypoint.sh not found — using image built-in.');
+
   // Generate .env — all paths use forward slashes for Docker compatibility
   const envLines = [`WORKTREE_PATH=${toDockerPath(worktreeRoot)}`, `DG_PORT=${dgPort}`, `TASK_KEY=${taskKey.toLowerCase()}`, `DOCKER_SOCK=${dockerSock}`, `DATAGROK_VERSION=${args.version || 'latest'}`, `DG_VERSION=${args.version || 'latest'}`, `GROK_CONNECT_VERSION=${args['grok-connect-version'] || 'latest'}`, `GROK_SPAWNER_VERSION=${args['grok-spawner-version'] || 'latest'}`, `JKG_VERSION=${args['jkg-version'] || 'latest'}`, `TOOLS_DEV_VERSION=${args['tools-dev-version'] || 'latest'}`, `FOLDER_NAME=${_path.default.basename(worktreeRoot)}`];
   for (const env of ['ANTHROPIC_API_KEY', 'DG_PUBLIC_BRANCH', 'JIRA_URL', 'JIRA_USERNAME', 'JIRA_TOKEN', 'GITHUB_TOKEN']) if (process.env[env]) envLines.push(`${env}=${process.env[env]}`);
@@ -341,12 +346,21 @@ function writeProjectFiles(taskKey, args, worktreeRoot, dgPort) {
   // Write host config compose override (mirrors deploy/fat_dev/dg-claude approach)
   const volumes = [];
 
-  // Claude profile (~/.claude + ~/.claude.json)
+  // Bind-mount local entrypoint so fixes take effect without rebuilding the image
+  if (hasLocalEntrypoint) volumes.push(`      - "${toDockerPath(entrypointPath)}:/usr/local/bin/entrypoint.sh"`);
+
+  // Claude profile: mount only credential/settings files, not the whole directory.
+  // Mounting ~/.claude entirely makes subdirs (session-env/, sessions/) unwritable by the
+  // container's node user due to host filesystem permission mapping.
   const claudeHome = findClaudeHome();
   if (claudeHome) {
-    volumes.push(`      - "${toDockerPath(claudeHome)}:/home/node/.claude"`);
+    const claudeFiles = ['.credentials.json', 'settings.json', 'settings.local.json'];
+    for (const file of claudeFiles) {
+      const filePath = _path.default.join(claudeHome, file);
+      if (_fs.default.existsSync(filePath) && _fs.default.statSync(filePath).isFile()) volumes.push(`      - "${toDockerPath(filePath)}:/home/node/.claude/${file}:ro"`);
+    }
     const claudeState = _path.default.join(_path.default.dirname(claudeHome), '.claude.json');
-    if (_fs.default.existsSync(claudeState) && _fs.default.statSync(claudeState).isFile()) volumes.push(`      - "${toDockerPath(claudeState)}:/home/node/.claude.json"`);
+    if (_fs.default.existsSync(claudeState) && _fs.default.statSync(claudeState).isFile()) volumes.push(`      - "${toDockerPath(claudeState)}:/home/node/.claude.json:ro"`);
     color.info(`Claude profile: ${claudeHome}`);
   } else color.warn('No Claude profile found. Set CLAUDE_HOME or run "claude" locally to log in.');
   const overridePath = _path.default.join(projectDir, 'docker-compose.override.yaml');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "6.0.5",
+  "version": "6.0.7",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {