@grekt/cli 6.40.2 → 6.41.0

package/dist/index.js

@@ -69082,7 +69082,7 @@ function createTokenProvider(projectRoot, getToken, getSessionToken) {
 // src/context/engine.ts
 import { join as join6 } from "path";
 
-// node_modules/@grekt-labs/cli-engine/dist/index.js
+// node_modules/@grekt/engine/dist/index.js
 import { createRequire as createRequire2 } from "node:module";
 import { resolve, normalize, isAbsolute as isAbsolute3, relative, join as join2 } from "path";
 import { tmpdir } from "os";
@@ -102293,14 +102293,40 @@ async function publishArtifact(publisher, ctx) {
 
 // src/workspace/workspace.ts
 var import_fast_glob2 = __toESM(require_out4(), 1);
-import { join as join29 } from "path";
+import { join as join30 } from "path";
+
+// src/workspace/file-backup/file-backup.ts
+import { join as join29, basename as basename12 } from "path";
+import { randomUUID as randomUUID3 } from "crypto";
+import { tmpdir as tmpdir4 } from "os";
+function backupFiles(paths) {
+  const manifest = new Map;
+  for (const filePath of paths) {
+    if (!fs.exists(filePath))
+      continue;
+    const fileId = randomUUID3().slice(0, 8);
+    const backupName = `grekt-bkp-${fileId}-${basename12(filePath)}`;
+    const backupPath = join29(tmpdir4(), backupName);
+    fs.copyFile(filePath, backupPath);
+    manifest.set(filePath, backupPath);
+  }
+  return manifest;
+}
+function restoreFiles(manifest) {
+  for (const [originalPath, backupPath] of manifest) {
+    fs.copyFile(backupPath, originalPath);
+    fs.unlink(backupPath);
+  }
+}
+
+// src/workspace/workspace.ts
 var WORKSPACE_CONFIG_FILE2 = "grekt-workspace.yaml";
 var ARTIFACT_MANIFEST_FILE2 = "grekt.yaml";
 async function loadWorkspace(cwd) {
   if (!isWorkspaceRoot(fs, cwd)) {
     return null;
   }
-  const configPath = join29(cwd, WORKSPACE_CONFIG_FILE2);
+  const configPath = join30(cwd, WORKSPACE_CONFIG_FILE2);
   const configContent = fs.readFile(configPath);
   const result = parseWorkspaceConfig(configContent, configPath);
   if (!result.success) {
@@ -102317,7 +102343,7 @@ async function loadWorkspace(cwd) {
       absolute: true
     });
     for (const fullPath of matches) {
-      const manifestPath = join29(fullPath, ARTIFACT_MANIFEST_FILE2);
+      const manifestPath = join30(fullPath, ARTIFACT_MANIFEST_FILE2);
       if (fs.exists(manifestPath)) {
         artifactPaths.push(fullPath);
       }
@@ -102330,26 +102356,27 @@ async function loadWorkspace(cwd) {
   };
 }
 function generateWorkspaceFile(root, artifacts) {
-  const workspacePath = join29(root, "pnpm-workspace.yaml");
-  const rootPackageJsonPath = join29(root, "package.json");
+  const workspacePath = join30(root, "pnpm-workspace.yaml");
+  const rootPackageJsonPath = join30(root, "package.json");
   const relativePaths = artifacts.map((artifact) => artifact.relativePath);
   fs.writeFile(workspacePath, $stringify2({ packages: relativePaths }));
   fs.writeFile(rootPackageJsonPath, JSON.stringify({ name: "workspace-root", private: true }, null, 2) + `
 `);
 }
-function cleanWorkspaceFile(root) {
-  const workspacePath = join29(root, "pnpm-workspace.yaml");
-  const rootPackageJsonPath = join29(root, "package.json");
-  if (fs.exists(workspacePath)) {
-    fs.unlink(workspacePath);
-  }
-  if (fs.exists(rootPackageJsonPath)) {
-    fs.unlink(rootPackageJsonPath);
+function cleanWorkspaceFile(root, manifest) {
+  const workspacePath = join30(root, "pnpm-workspace.yaml");
+  const rootPackageJsonPath = join30(root, "package.json");
+  for (const filePath of [workspacePath, rootPackageJsonPath]) {
+    if (manifest?.has(filePath)) {
+      restoreFiles(new Map([[filePath, manifest.get(filePath)]]));
+    } else if (fs.exists(filePath)) {
+      fs.unlink(filePath);
+    }
   }
 }
 function generatePackageJsonFiles(artifacts) {
   for (const artifact of artifacts) {
-    const packageJsonPath = join29(artifact.path, "package.json");
+    const packageJsonPath = join30(artifact.path, "package.json");
     const packageJson = {
       name: artifact.manifest.name,
       version: artifact.manifest.version,
@@ -102362,8 +102389,8 @@ function generatePackageJsonFiles(artifacts) {
 function syncVersionsToManifest(artifacts) {
   let updated = 0;
   for (const artifact of artifacts) {
-    const packageJsonPath = join29(artifact.path, "package.json");
-    const manifestPath = join29(artifact.path, ARTIFACT_MANIFEST_FILE2);
+    const packageJsonPath = join30(artifact.path, "package.json");
+    const manifestPath = join30(artifact.path, ARTIFACT_MANIFEST_FILE2);
     if (!fs.exists(packageJsonPath))
       continue;
     const packageJson = JSON.parse(fs.readFile(packageJsonPath));
@@ -102378,10 +102405,12 @@ function syncVersionsToManifest(artifacts) {
   }
   return updated;
 }
-function cleanPackageJsonFiles(artifacts) {
+function cleanPackageJsonFiles(artifacts, manifest) {
   for (const artifact of artifacts) {
-    const packageJsonPath = join29(artifact.path, "package.json");
-    if (fs.exists(packageJsonPath)) {
+    const packageJsonPath = join30(artifact.path, "package.json");
+    if (manifest?.has(packageJsonPath)) {
+      restoreFiles(new Map([[packageJsonPath, manifest.get(packageJsonPath)]]));
+    } else if (fs.exists(packageJsonPath)) {
       fs.unlink(packageJsonPath);
     }
   }
@@ -103180,7 +103209,7 @@ function displayUpgradeSummary(results) {
 }
 
 // src/commands/version.ts
-import { join as join30, resolve as resolve7 } from "path";
+import { join as join31, resolve as resolve7 } from "path";
 import { spawnSync } from "child_process";
 var MANIFEST_FILE = "grekt.yaml";
 var BUMP_TYPES = ["patch", "minor", "major", "prerelease"];
@@ -103233,7 +103262,7 @@ var versionCommand = new Command("version").description("Bump artifact versions
   log("");
   let updated = 0;
   for (const artifactPath of artifactPaths) {
-    const manifestPath = join30(artifactPath, MANIFEST_FILE);
+    const manifestPath = join31(artifactPath, MANIFEST_FILE);
     const manifestContent = fs.readFile(manifestPath);
     const result = safeParseYaml(manifestContent, ProjectConfigSchema, manifestPath);
     if (!result.success) {
@@ -103289,6 +103318,12 @@ async function handleExecMode(options2) {
     info(`Would run: ${command}`);
     return;
   }
+  const filesToTouch = [
+    join31(cwd, "pnpm-workspace.yaml"),
+    join31(cwd, "package.json"),
+    ...workspace.artifacts.map((a) => join31(a.path, "package.json"))
+  ];
+  const manifest = backupFiles(filesToTouch);
   const genSpin = spinner("Generating workspace config files...");
   genSpin.start();
   generateWorkspaceFile(cwd, workspace.artifacts);
@@ -103304,8 +103339,8 @@ async function handleExecMode(options2) {
     stdio: "inherit"
   });
   if (result.status !== 0) {
-    cleanWorkspaceFile(cwd);
-    cleanPackageJsonFiles(workspace.artifacts);
+    cleanWorkspaceFile(cwd, manifest);
+    cleanPackageJsonFiles(workspace.artifacts, manifest);
     error(`Command failed with exit code ${result.status}`);
     process.exit(result.status ?? 1);
   }
@@ -103315,8 +103350,8 @@ async function handleExecMode(options2) {
   const updatedWorkspace = await loadWorkspace(cwd);
   if (!updatedWorkspace) {
     syncSpin.stop();
-    cleanWorkspaceFile(cwd);
-    cleanPackageJsonFiles(workspace.artifacts);
+    cleanWorkspaceFile(cwd, manifest);
+    cleanPackageJsonFiles(workspace.artifacts, manifest);
     error("Failed to reload workspace");
     process.exit(1);
   }
@@ -103329,8 +103364,8 @@ async function handleExecMode(options2) {
   }
   const cleanSpin = spinner("Cleaning up...");
   cleanSpin.start();
-  cleanWorkspaceFile(cwd);
-  cleanPackageJsonFiles(workspace.artifacts);
+  cleanWorkspaceFile(cwd, manifest);
+  cleanPackageJsonFiles(workspace.artifacts, manifest);
   cleanSpin.stop();
   success("Removed temporary config files");
   log("");
@@ -103338,7 +103373,7 @@ async function handleExecMode(options2) {
 }
 function findArtifacts(basePath) {
   const artifacts = [];
-  if (fs.exists(join30(basePath, MANIFEST_FILE))) {
+  if (fs.exists(join31(basePath, MANIFEST_FILE))) {
     artifacts.push(basePath);
     return artifacts;
   }
@@ -103347,9 +103382,9 @@ function findArtifacts(basePath) {
     for (const entry of entries) {
       if (entry.startsWith("."))
         continue;
-      const subPath = join30(basePath, entry);
+      const subPath = join31(basePath, entry);
       const stat = fs.stat(subPath);
-      if (stat.isDirectory && fs.exists(join30(subPath, MANIFEST_FILE))) {
+      if (stat.isDirectory && fs.exists(join31(subPath, MANIFEST_FILE))) {
         artifacts.push(subPath);
       }
     }
@@ -103492,18 +103527,18 @@ function mapFilesToArtifacts(changedFiles, artifacts) {
 }
 
 // src/commands/changelog/changeset-output.ts
-import { join as join31 } from "path";
+import { join as join32 } from "path";
 import { randomBytes as randomBytes3 } from "crypto";
 var CHANGESET_DIR = ".changeset";
 function generateChangesetFiles(artifacts, workspaceRoot) {
-  const changesetDir = join31(workspaceRoot, CHANGESET_DIR);
+  const changesetDir = join32(workspaceRoot, CHANGESET_DIR);
   if (!fs.exists(changesetDir)) {
     fs.mkdir(changesetDir, { recursive: true });
   }
   const paths = [];
   for (const artifact of artifacts) {
     const filename = `${randomBytes3(4).toString("hex")}.md`;
-    const filepath = join31(changesetDir, filename);
+    const filepath = join32(changesetDir, filename);
     const content = buildChangesetContent([artifact]);
     fs.writeFile(filepath, content);
     paths.push(filepath);
@@ -103721,7 +103756,7 @@ var listSubcommand = new Command("list").description("List all artifacts in the
 });
 var workspaceCommand = new Command("workspace").description("Manage monorepo workspaces").addCommand(listSubcommand);
 // src/commands/worktree/worktree.ts
-import { join as join32, dirname as dirname11, isAbsolute as isAbsolute4 } from "path";
+import { join as join33, dirname as dirname11, isAbsolute as isAbsolute4 } from "path";
 var GREKT_DIR2 = ".grekt";
 function getGitCommonDir() {
   try {
@@ -103738,7 +103773,7 @@ function getWorktreeRoot() {
   }
 }
 function resolveOriginalRepoRoot(commonDir, worktreeRoot) {
-  const absoluteCommonDir = isAbsolute4(commonDir) ? commonDir : join32(worktreeRoot, commonDir);
+  const absoluteCommonDir = isAbsolute4(commonDir) ? commonDir : join33(worktreeRoot, commonDir);
   return dirname11(absoluteCommonDir);
 }
 function isInsideWorktree(commonDir) {
@@ -103761,8 +103796,8 @@ var syncSubcommand = new Command("sync").description("Copy .grekt/ from the orig
     process.exit(1);
   }
   const originalRepoRoot = resolveOriginalRepoRoot(commonDir, worktreeRoot);
-  const sourcePath = join32(originalRepoRoot, GREKT_DIR2);
-  const destPath = join32(worktreeRoot, GREKT_DIR2);
+  const sourcePath = join33(originalRepoRoot, GREKT_DIR2);
+  const destPath = join33(worktreeRoot, GREKT_DIR2);
   if (!fs.exists(sourcePath)) {
     info("No .grekt/ directory found in the original repository");
     process.exit(0);
@@ -103785,7 +103820,7 @@ var syncSubcommand = new Command("sync").description("Copy .grekt/ from the orig
 });
 var worktreeCommand = new Command("worktree").description("Manage git worktree integration").addCommand(syncSubcommand);
 // src/commands/scan.ts
-import { join as join33, resolve as resolve8 } from "path";
+import { join as join34, resolve as resolve8 } from "path";
 var VALID_BADGES = ["certified", "conditional", "suspicious", "rejected"];
 var BADGE_COLORS = {
   certified: colors5.success,
@@ -103881,7 +103916,7 @@ var scanCommand = new Command("scan").description("Scan artifacts for security i
 });
 async function scanRemoteArtifact(source, projectRoot, jsonOutput, failOnThreshold) {
   const displayName = getSourceDisplayName(source);
-  const tempDir = join33(projectRoot, ARTIFACTS_DIR, `.tmp-scan-${cryptoProvider.randomUUID()}`);
+  const tempDir = join34(projectRoot, ARTIFACTS_DIR, `.tmp-scan-${cryptoProvider.randomUUID()}`);
   try {
     if (!jsonOutput) {
       const spin = spinner(`Downloading ${colors5.highlight(displayName)}...`);
@@ -104007,14 +104042,14 @@ async function scanAllInstalled(projectRoot, jsonOutput, failOnThreshold) {
   }
   const config = getConfig(projectRoot);
   const trustKey = process.env.GREKT_TRUST_KEY;
-  const artifactsDir = join33(projectRoot, ARTIFACTS_DIR);
+  const artifactsDir = join34(projectRoot, ARTIFACTS_DIR);
   const results = [];
   const errors4 = [];
   if (!jsonOutput) {
     log(`Scanning ${colors5.bold(String(artifactIds.length))} artifact${artifactIds.length === 1 ? "" : "s"}...`);
   }
   for (const artifactId of artifactIds) {
-    const artifactDir = join33(artifactsDir, artifactId);
+    const artifactDir = join34(artifactsDir, artifactId);
     if (!fs.exists(artifactDir)) {
       errors4.push({ artifactId, message: "Not installed (directory missing)" });
       continue;
@@ -104139,7 +104174,7 @@ var untrustCommand = new Command("untrust").description("Remove trusted status f
 
 // src/auth/oauth/oauth.ts
 import { spawn } from "child_process";
-import { randomUUID as randomUUID3 } from "crypto";
+import { randomUUID as randomUUID4 } from "crypto";
 var LOGIN_TIMEOUT_MS = 5 * 60 * 1000;
 var POLL_INTERVAL_MS = 2000;
 function openBrowser(url) {
@@ -104194,7 +104229,7 @@ function sleep(ms) {
 async function browserLogin(provider, callbacks) {
   const supabase = getSupabaseClient();
   const supabaseUrl = getSupabaseUrl();
-  const sessionId = randomUUID3();
+  const sessionId = randomUUID4();
   const redirectTo = `${supabaseUrl}/functions/v1/cli-auth-callback?session_id=${sessionId}`;
   const { data, error: oauthError } = await supabase.auth.signInWithOAuth({
     provider,
@@ -104362,7 +104397,7 @@ var whoamiCommand = new Command("whoami").description("Show current user").actio
 // package.json
 var package_default = {
   name: "@grekt/cli",
-  version: "6.40.2",
+  version: "6.41.0",
   description: "AI tools versioned, synced, and shared across tools and teams",
   type: "module",
   bin: {
@@ -104397,7 +104432,7 @@ var package_default = {
   },
   dependencies: {
     "@aws-sdk/client-s3": "^3.971.0",
-    "@grekt-labs/cli-engine": "6.1.0",
+    "@grekt/engine": "6.1.1",
     "@inquirer/prompts": "^7.2.0",
     "@supabase/supabase-js": "^2.91.0",
     chalk: "^5.4.1",
@@ -104431,13 +104466,13 @@ var package_default = {
 // src/update-check/update-check.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync3, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
 import { homedir as homedir3 } from "os";
-import { join as join34 } from "path";
+import { join as join35 } from "path";
 var CACHE_FILENAME = ".update-check";
 var STALENESS_MS = 24 * 60 * 60 * 1000;
 var FETCH_TIMEOUT_MS = 1500;
 var GITHUB_RELEASES_URL = "https://api.github.com/repos/grekt-labs/cli/releases/latest";
 function getCachePath() {
-  return join34(homedir3(), ".grekt", CACHE_FILENAME);
+  return join35(homedir3(), ".grekt", CACHE_FILENAME);
 }
 function isOptedOut() {
   return process.env.GREKT_NO_UPDATE_CHECK === "1";
@@ -104456,7 +104491,7 @@ function readCache() {
 }
 function writeCache(cache2) {
   try {
-    const dir = join34(homedir3(), ".grekt");
+    const dir = join35(homedir3(), ".grekt");
     if (!existsSync2(dir)) {
       mkdirSync3(dir, { recursive: true });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grekt/cli",
-  "version": "6.40.2",
+  "version": "6.41.0",
   "description": "AI tools versioned, synced, and shared across tools and teams",
   "type": "module",
   "bin": {
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.971.0",
-    "@grekt-labs/cli-engine": "6.1.0",
+    "@grekt/engine": "6.1.1",
     "@inquirer/prompts": "^7.2.0",
     "@supabase/supabase-js": "^2.91.0",
     "chalk": "^5.4.1",