@trayai/tray-sync-cli 1.0.2 → 1.0.4

package/README.md

@@ -19,7 +19,6 @@ npm install -g @trayai/tray-sync-cli
 | `tray pull` | Export tracked projects from Tray and materialise them on disk |
 | `tray promote <env>` | Reconstruct local projects and import them into a target Tray environment |
 | `tray status` | Local checksum-based drift detection (zero API calls) |
-| `tray project add <project-id>` | Track a project (project scope only) |
 | `tray project remove <project-id>` | Untrack a project and delete its local directory (project scope only) |
 | `tray project list` | List managed projects with directory names and last-pulled timestamps |
 | `tray env add <name>` | Add a target environment |
@@ -77,7 +76,7 @@ lists every project in your source workspace — id + name — so you don't have
 
 A few notes on the flags:
 
-- **`-p <project-id>`** pulls that project immediately after scaffolding. Omit it and `init` just scaffolds an empty repository — you can pull specific projects later with: `tray pull -p <project_id>` OR  `tray project add <project-id>` followed by `tray pull`. 
+- **`-p <project-id>`** pulls that project immediately after scaffolding. Omit it and `init` just scaffolds an empty repository — you can pull specific projects later with `tray pull -p <project_id>`, which tracks and pulls it in one step.
 - **`-s workspace`** (i.e. `tray init -s workspace -r <region> -w <id> -t <token>`, omitting `-p`) switches to workspace scope: every project in the workspace is pulled automatically, and `tray pull` keeps that mirror in sync going forward (including removing projects deleted from Tray). `-p` is ignored in this scope.
 - **`-t <token>`** is optional at `init` time. If you skip it (or need to replace it later — tokens expire), set or refresh it any time with:
   ```bash

package/dist/commands/project.js

@@ -1,15 +1,12 @@
 import path from "node:path";
 import { readdir as fsReaddir, rm as fsRm } from "node:fs/promises";
 import { Command, InvalidArgumentError } from "commander";
-import { createTrayClientForRegion } from "../api/trayClient.js";
-import { readCredentials } from "../config/credentials.js";
 import { readProjectState } from "../config/state.js";
 import { readTrayYaml, writeTrayYaml } from "../config/trayYaml.js";
 import { Scopes } from "../config/types.js";
-import { resolveToken } from "../lib/tokenResolution.js";
 import { isUuid } from "../lib/uuid.js";
 import { OutputFormats, parseFormat } from "../lib/outputFormat.js";
-import { printAddedProject, printAlreadyTracked, printNoProjectsTracked, printNotTracked, printProjectListTable, printRemovedProject, printTrayYamlNotFound, printValidationSkippedOrFailed, printValidationSucceeded, printWorkspaceScopeDenied, } from "../views/project/project.v2.js";
+import { printNoProjectsTracked, printNotTracked, printProjectListTable, printRemovedProject, printTrayYamlNotFound, printWorkspaceScopeDenied, } from "../views/project/project.v2.js";
 import { printProjectListJson } from "../views/project/shared.js";
 function findProjectDir(existingDirs, projectId) {
     return existingDirs.find((name) => name.split("--")[0] === projectId);
@@ -36,37 +33,6 @@ async function listProjectDirs(readdir, projectsRoot) {
         return [];
     }
 }
-export async function runProjectAdd(deps, options) {
-    const { cwd, env, createClient, stdout, stderr } = deps;
-    const trayYaml = await requireTrayYaml(deps);
-    if (!trayYaml)
-        return 1;
-    if (refuseIfWorkspaceScope(trayYaml, stderr))
-        return 1;
-    if (trayYaml.projects.includes(options.projectId)) {
-        printAlreadyTracked(stdout, options.projectId);
-        return 0;
-    }
-    const credentials = await readCredentials(env);
-    try {
-        const token = resolveToken({
-            tokenFlag: options.token,
-            credentials,
-            workspaceId: trayYaml.workspace_id,
-            env,
-        });
-        const client = createClient(trayYaml.region, token);
-        await client.request("GET", `/v2/projects/${options.projectId}`);
-        printValidationSucceeded(stdout, options.projectId);
-    }
-    catch (err) {
-        printValidationSkippedOrFailed(stdout, err.message);
-    }
-    const projects = [...trayYaml.projects, options.projectId].sort();
-    await writeTrayYaml({ ...trayYaml, projects }, cwd);
-    printAddedProject(stdout, options.projectId);
-    return 0;
-}
 export async function runProjectRemove(deps, options) {
     const { cwd, readdir, rm, stdout, stderr } = deps;
     const trayYaml = await requireTrayYaml(deps);
@@ -136,27 +102,13 @@ function parseUuid(value, flagName) {
 function realDeps() {
     return {
         cwd: process.cwd(),
-        env: process.env,
-        createClient: (region, token) => createTrayClientForRegion(region, token),
         readdir: (dir) => fsReaddir(dir),
         rm: (dir) => fsRm(dir, { recursive: true, force: true }),
         stdout: (line) => console.log(line),
         stderr: (line) => console.error(line),
     };
 }
-export const projectCommand = new Command("project").description("Manage tray.yaml.projects (project scope only for add/remove)");
-projectCommand
-    .command("add")
-    .description("Track a project (project scope only)")
-    .argument("<project-id>", "Tray project UUID", (value) => parseUuid(value, "project-id"))
-    .option("-t, --token <token>", "Tray API token, for best-effort validation")
-    .action(async (projectId, opts) => {
-    const exitCode = await runProjectAdd(realDeps(), {
-        projectId,
-        token: opts.token,
-    });
-    process.exitCode = exitCode;
-});
+export const projectCommand = new Command("project").description("Manage tray.yaml.projects (project scope only for remove; use `tray pull -p <id>` to add)");
 projectCommand
     .command("remove")
     .description("Untrack a project and delete its local directory (project scope only)")

package/dist/commands/pull.js

@@ -9,7 +9,7 @@ import { readPullProgress, writePullProgress } from "../config/pullProgress.js";
 import { readProjectState, writeProjectState } from "../config/state.js";
 import { readTrayYaml, writeTrayYaml } from "../config/trayYaml.js";
 import { Scopes, TrayTypes, } from "../config/types.js";
-import { entityDirName } from "../lib/slug.js";
+import { entityDirName, findDirsWithStaleSlug } from "../lib/slug.js";
 import { entityDisplayName, parseExportStructure, } from "../lib/exportStructure.js";
 import { extractScripts } from "../lib/scriptExtraction.js";
 import { sha256 } from "../lib/checksum.js";
@@ -74,10 +74,22 @@ export async function writeExportedProject(projectDirPath, exportStructure, stdo
     const resources = {};
     for (const { field, dirName, fileName, trayType } of ASSET_DIRS) {
         const entities = exportStructure[field] ?? [];
+        const entityParentDir = path.join(projectDirPath, dirName);
         for (const entity of entities) {
             const entityId = requireUuid(entity.id, `exportProject: ${field}[].id`);
             const entityDirName_ = entityDirName(entityId, entityDisplayName(entity));
-            const entityDir = resolveContained(path.join(projectDirPath, dirName), entityDirName_);
+            const entityDir = resolveContained(entityParentDir, entityDirName_);
+            let staleDirNames;
+            try {
+                staleDirNames = findDirsWithStaleSlug(await fsReaddir(entityParentDir), entityId, entityDirName_);
+            }
+            catch {
+                staleDirNames = [];
+            }
+            for (const staleDirName of staleDirNames) {
+                const staleDir = await resolveContainedSafe(entityParentDir, staleDirName);
+                await fsRm(staleDir, { recursive: true, force: true });
+            }
             const entityJsonPath = path.join(entityDir, fileName);
             await assertNoSymlinkInPath(projectDirPath, entityJsonPath);
             await writeJson(entityJsonPath, entity);
@@ -195,7 +207,7 @@ export async function runPull(deps, options) {
         const dir = await resolveContainedSafe(projectsRoot, newDirName);
         let existingDirName;
         try {
-            existingDirName = (await readdir(projectsRoot)).find((name) => name.split("--")[0] === validatedProjectId && name !== newDirName);
+            existingDirName = findDirsWithStaleSlug(await readdir(projectsRoot), validatedProjectId, newDirName)[0];
         }
         catch {
             existingDirName = undefined;

package/dist/lib/slug.js

@@ -11,4 +11,7 @@ export function slugify(name) {
 export function entityDirName(uuid, name) {
     return `${uuid}--${slugify(name)}`;
 }
+export function findDirsWithStaleSlug(dirNames, uuid, currentDirName) {
+    return dirNames.filter((name) => name.split("--")[0] === uuid && name !== currentDirName);
+}
 //# sourceMappingURL=slug.js.map

package/dist/views/project/project.v2.js

@@ -5,20 +5,8 @@ export function printTrayYamlNotFound(stderr) {
     stderr(`${FAILURE_ICON} tray.yaml not found. Run \`${ansis.bold("tray init")}\` first.`);
 }
 export function printWorkspaceScopeDenied(stderr) {
-    stderr(`${INFO_ICON} Operation denied. Project add/removal is not allowed in workspace scope.`);
-    stderr(`   Create your project with ${ansis.bold("--scope project")} (or omit --scope) in a new directory to use \`${ansis.bold("tray project add/remove")}\` commands.`);
-}
-export function printAlreadyTracked(stdout, projectId) {
-    stdout(`${ansis.bold(projectId)} is already tracked.`);
-}
-export function printValidationSucceeded(stdout, projectId) {
-    stdout(`Validation: ✓ (${ansis.bold(projectId)} found in Tray)`);
-}
-export function printValidationSkippedOrFailed(stdout, message) {
-    stdout(`Validation: skipped or failed (${message})`);
-}
-export function printAddedProject(stdout, projectId) {
-    stdout(`${ansis.bold("Added")} ${ansis.bold(projectId)} to tray.yaml.projects.`);
+    stderr(`${INFO_ICON} Operation denied. Project removal is not allowed in workspace scope.`);
+    stderr(`   Create your project with ${ansis.bold("--scope project")} (or omit --scope) in a new directory to use \`${ansis.bold("tray project remove")}\`.`);
 }
 export function printNotTracked(stdout, projectId) {
     stdout(`${ansis.bold(projectId)} is not tracked.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayai/tray-sync-cli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "CLI tool to clone Tray projects and related assets to a local directory, and promote them between Tray environments",
   "bin": {
     "tray": "dist/cli.js"