@factorialco/fcode-cli 2.4.0 → 3.1.0

package/dist/commands/{team → settings}/versions/list.js

@@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const color_1 = require("@oclif/color");
 const api_client_command_1 = require("../../../core/commands/api-client-command");
 const cli_1 = require("../../../utils/cli");
-class TeamVersionsListCommand extends api_client_command_1.default {
+class SettingsVersionsListCommand extends api_client_command_1.default {
     async run() {
-        await this.parse(TeamVersionsListCommand);
+        await this.parse(SettingsVersionsListCommand);
         const versions = await this._fcodeGraphQLClient.allTeamVersions();
         if (versions.length === 0) {
-            cli_1.default.log('📋 No team versions published yet.');
-            cli_1.default.log(`Publish one with ${color_1.default.cyan('fcode team:versions:create [tag]')}`);
+            cli_1.default.log('📋 No workspace versions published yet.');
+            cli_1.default.log(`Publish one with ${color_1.default.cyan('fcode settings:versions:create [tag]')}`);
             return;
         }
-        cli_1.default.log('🏷️  Team versions:\n');
+        cli_1.default.log('🏷️  Workspace versions:\n');
         for (const version of versions) {
             const comment = version.comment ? ` — ${version.comment}` : '';
             const author = version.createdBy?.name ? ` by ${version.createdBy.name}` : '';
@@ -20,6 +20,6 @@ class TeamVersionsListCommand extends api_client_command_1.default {
         }
     }
 }
-TeamVersionsListCommand.description = 'List the team versions published on the active team workspace';
-TeamVersionsListCommand.examples = ['$ fcode team:versions:list'];
-exports.default = TeamVersionsListCommand;
+SettingsVersionsListCommand.description = 'List the workspace versions published on the active workspace';
+SettingsVersionsListCommand.examples = ['$ fcode settings:versions:list'];
+exports.default = SettingsVersionsListCommand;

package/dist/commands/status.d.ts

@@ -2,5 +2,8 @@ import BaseCommand from '../core/commands/base-command';
 export default class Status extends BaseCommand {
     static description: string;
     static examples: string[];
+    static flags: {
+        showInherited: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
     run(): Promise<void>;
 }

package/dist/commands/status.js

@@ -6,19 +6,22 @@ const status_2 = require("./processes/status");
 const status_3 = require("./variables/status");
 const status_4 = require("./i18n/status");
 const status_5 = require("./dependencies/status");
-const status_6 = require("./team/status");
+const status_6 = require("./settings/status");
+const types_1 = require("../core/types");
 class Status extends base_command_1.default {
     async run() {
-        await this.parse(Status);
+        const { flags: { showInherited }, } = await this.parse(Status);
+        const args = showInherited ? ['--showInherited'] : [];
         await this.logActiveTeam();
-        await status_2.default.run([]);
-        await status_1.default.run([]);
-        await status_3.default.run([]);
-        await status_4.default.run([]);
+        await status_2.default.run(args);
+        await status_1.default.run(args);
+        await status_3.default.run(args);
+        await status_4.default.run(args);
         await status_5.default.run([]);
         await status_6.default.run([]);
     }
 }
 Status.description = 'Show team workspace status';
-Status.examples = ['$ fcode status'];
+Status.examples = ['$ fcode status', '$ fcode status --showInherited'];
+Status.flags = types_1.ShowInheritedFlag;
 exports.default = Status;

package/dist/commands/team/clone.d.ts

@@ -0,0 +1,14 @@
+import { Command } from '@oclif/core';
+export default class TeamCloneCommand extends Command {
+    static description: string;
+    static examples: string[];
+    static args: {
+        teamId: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static flags: {
+        skipSkillsSetup: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    init(): Promise<void>;
+    run(): Promise<void>;
+    private skipSkills;
+}

package/dist/commands/team/clone.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@oclif/core");
+const fs = require("fs-extra");
+const path = require("node:path");
+const color_1 = require("@oclif/color");
+const dashboard_client_1 = require("../../services/dashboard-client");
+const dev_team_1 = require("../../config/dev-team");
+const global_1 = require("../../config/global");
+const skills_installer_1 = require("../../services/skills-installer");
+const dev_team_service_1 = require("../../services/dev-team-service");
+const settings_1 = require("../../config/settings");
+const slugify_1 = require("../../utils/slugify");
+const cli_1 = require("../../utils/cli");
+class TeamCloneCommand extends core_1.Command {
+    async init() {
+        const { url } = (0, global_1.parseTeamOrigin)('');
+        const { authUrl } = await new global_1.default().getAuthInfo(url);
+        await this.config.runHook('auth', { argv: [url, authUrl], id: 'login' });
+    }
+    async run() {
+        const { args, flags } = await this.parse(TeamCloneCommand);
+        const cloudUrl = global_1.FCODE_CLOUD_URL;
+        const client = new dashboard_client_1.default(cloudUrl);
+        const team = await (0, dev_team_service_1.resolveTeam)(client, args.teamId);
+        if (!team) {
+            return;
+        }
+        const remote = await (0, dev_team_service_1.fetchTeamRemote)(client, team.id);
+        if (remote.apps.length === 0 && remote.globalWorkspaces.length === 0) {
+            cli_1.default.log(`ℹ️  '${team.name}' has no Apps or global workspaces yet.`);
+            return;
+        }
+        const rootDir = path.resolve((0, slugify_1.slugifyOr)(team.name, team.id));
+        if (fs.pathExistsSync(rootDir) && fs.readdirSync(rootDir).length > 0) {
+            this.error(`Destination path '${path.basename(rootDir)}' already exists and is not empty.`, {
+                code: 'ERR_TEAM_DIR_IS_NOT_EMPTY',
+                exit: 1,
+                suggestions: [`cd ${path.basename(rootDir)}`, 'fcode team:pull'],
+            });
+        }
+        cli_1.default.log(color_1.default.cyan(`\n🏢 cloning ${remote.apps.length} App(s) and ${remote.globalWorkspaces.length} global workspace(s) of '${team.name}'...`));
+        const metadata = {
+            developmentTeam: { id: team.id, name: team.name },
+            cloudUrl,
+            apps: {},
+            globalWorkspaces: {},
+        };
+        // Written before anything is cloned, so a run interrupted halfway still leaves a folder
+        // `fcode team:pull` recognises and can finish.
+        const config = new dev_team_1.default(rootDir);
+        config.write(metadata);
+        // Skills next: each workspace links to them as it lands, so an install that fails leaves
+        // everything cloned and only the links missing.
+        if (!(await this.skipSkills(flags.skipSkillsSetup))) {
+            await (0, skills_installer_1.installSkillsAt)(rootDir);
+        }
+        const result = await (0, dev_team_service_1.syncTeam)(rootDir, metadata, remote);
+        config.write(metadata);
+        if ((0, dev_team_service_1.reportOutcomes)(result)) {
+            process.exitCode = 1;
+            cli_1.default.log(`\n⚠️  '${team.name}' cloned with errors — rerun 'fcode team:pull' inside the folder to retry.\n`);
+        }
+        else {
+            cli_1.default.log(`\n🎉  '${team.name}' cloned successfully!\n`);
+        }
+        cli_1.default.log(`$ cd ${path.basename(rootDir)}\n`);
+    }
+    async skipSkills(flag) {
+        if (flag !== undefined) {
+            return flag;
+        }
+        return (await new global_1.default().getSetting(settings_1.SettingKeys.SKIP_SKILLS_SETUP)) === 'true';
+    }
+}
+TeamCloneCommand.description = "Clone a development team into one folder — an App folder each, holding the App's development workspace, plus the team's global workspaces under global-workspaces/";
+TeamCloneCommand.examples = ['$ fcode team:clone', '$ fcode team:clone 0f9c1a2b-3d4e-5f60-8a1b-2c3d4e5f6071'];
+TeamCloneCommand.args = {
+    teamId: core_1.Args.string({
+        description: 'development team id (run without it to list the teams you belong to)',
+        name: 'teamId',
+        required: false,
+    }),
+};
+TeamCloneCommand.flags = {
+    skipSkillsSetup: core_1.Flags.boolean({
+        description: 'Skip installation of the Factorial Code agent skills',
+    }),
+};
+exports.default = TeamCloneCommand;

package/dist/commands/team/pull.d.ts

@@ -1,11 +1,7 @@
-import ApiClientCommand from '../../core/commands/api-client-command';
-import TeamRepository from '../../repositories/team';
-export default class TeamPullCommand extends ApiClientCommand {
+import { Command } from '@oclif/core';
+export default class TeamPullCommand extends Command {
     static description: string;
     static examples: string[];
-    static flags: {
-        force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    };
-    _teamRepository: TeamRepository;
+    init(): Promise<void>;
     run(): Promise<void>;
 }

package/dist/commands/team/pull.js

@@ -1,41 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@oclif/core");
 const color_1 = require("@oclif/color");
-const api_client_command_1 = require("../../core/commands/api-client-command");
-const team_1 = require("../../repositories/team");
-const types_1 = require("../../core/types");
+const dashboard_client_1 = require("../../services/dashboard-client");
+const dev_team_1 = require("../../config/dev-team");
+const global_1 = require("../../config/global");
+const dev_team_service_1 = require("../../services/dev-team-service");
 const cli_1 = require("../../utils/cli");
-class TeamPullCommand extends api_client_command_1.default {
-    constructor() {
-        super(...arguments);
-        this._teamRepository = new team_1.default();
+class TeamPullCommand extends core_1.Command {
+    async init() {
+        const { url } = (0, global_1.parseTeamOrigin)('');
+        const { authUrl } = await new global_1.default().getAuthInfo(url);
+        await this.config.runHook('auth', { argv: [url, authUrl], id: 'login' });
     }
     async run() {
-        const { flags: { force }, } = await this.parse(TeamPullCommand);
-        cli_1.default.log(color_1.default.cyan('\n🗄️  pulling team settings...'));
-        // Local edits (a version tag added, an alias re-pointed) would be silently wiped by the
-        // overwrite below, so an unpushed team.json blocks the pull. No stored hash means there is
-        // no baseline to have diverged from (fresh workspace), so the pull proceeds.
-        if (!force && this._teamRepository.exists()) {
-            const local = await this._teamRepository.find();
-            const storedHash = await this.workspaceConfig.getTeamStoredHash();
-            if (storedHash !== undefined && storedHash !== local.contentHash) {
-                cli_1.default.log(color_1.default.yellow('🔺 team.json has unpushed local changes — run fcode team:push first, or fcode team:pull --force to overwrite them'));
-                return;
-            }
+        await this.parse(TeamPullCommand);
+        const rootDir = process.cwd();
+        const config = new dev_team_1.default(rootDir);
+        const metadata = config.read();
+        const { developmentTeam } = metadata;
+        cli_1.default.log(color_1.default.cyan(`\n🏢 pulling '${developmentTeam.name}'...`));
+        const remote = await (0, dev_team_service_1.fetchTeamRemote)(new dashboard_client_1.default(metadata.cloudUrl), developmentTeam.id);
+        const result = await (0, dev_team_service_1.syncTeam)(rootDir, metadata, remote);
+        // Written even when a workspace failed, so the ones that did land are recorded and a rerun
+        // only retries what is still missing.
+        config.write(metadata);
+        if ((0, dev_team_service_1.reportOutcomes)(result)) {
+            process.exitCode = 1;
         }
-        const [raw, versions, aliases] = await Promise.all([
-            this._fcodeGraphQLClient.team(),
-            this._fcodeGraphQLClient.allTeamVersions(),
-            this._fcodeGraphQLClient.allTeamVersionAliases(),
-        ]);
-        const team = await this._teamRepository.fromRaw(raw);
-        this._teamRepository.applyCloudVersioning(team, versions, aliases);
-        this._teamRepository.save(team);
-        await this.workspaceConfig.setTeamStoredHash(team.contentHash);
     }
 }
-TeamPullCommand.description = 'Fetch team settings (timezone, error handler, inheritance) and team versions/aliases from cloud into team.json';
+TeamPullCommand.description = 'Pull the development team folder: clones Apps and global workspaces added since the last run and pulls every workspace';
 TeamPullCommand.examples = ['$ fcode team:pull'];
-TeamPullCommand.flags = types_1.ForceFlag;
 exports.default = TeamPullCommand;

package/dist/commands/team/status.d.ts

@@ -1,8 +1,7 @@
-import ApiClientCommand from '../../core/commands/api-client-command';
-import TeamRepository from '../../repositories/team';
-export default class TeamStatusCommand extends ApiClientCommand {
+import { Command } from '@oclif/core';
+export default class TeamStatusCommand extends Command {
     static description: string;
     static examples: string[];
-    _teamRepository: TeamRepository;
+    init(): Promise<void>;
     run(): Promise<void>;
 }

package/dist/commands/team/status.js

@@ -1,46 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@oclif/core");
+const fs = require("fs-extra");
+const path = require("node:path");
 const color_1 = require("@oclif/color");
-const api_client_command_1 = require("../../core/commands/api-client-command");
-const team_1 = require("../../repositories/team");
+const dev_team_1 = require("../../config/dev-team");
+const global_1 = require("../../config/global");
+const status_1 = require("../status");
+const workspace_cloner_1 = require("../../services/workspace-cloner");
 const cli_1 = require("../../utils/cli");
-class TeamStatusCommand extends api_client_command_1.default {
-    constructor() {
-        super(...arguments);
-        this._teamRepository = new team_1.default();
+class TeamStatusCommand extends core_1.Command {
+    async init() {
+        const { url } = (0, global_1.parseTeamOrigin)('');
+        const { authUrl } = await new global_1.default().getAuthInfo(url);
+        await this.config.runHook('auth', { argv: [url, authUrl], id: 'login' });
     }
     async run() {
         await this.parse(TeamStatusCommand);
-        cli_1.default.log(color_1.default.cyan('\nteam status'));
-        if (!this._teamRepository.exists()) {
-            cli_1.default.log('No team.json found');
-            return;
+        const rootDir = process.cwd();
+        const metadata = new dev_team_1.default(rootDir).read();
+        const checkouts = [
+            ...Object.values(metadata.globalWorkspaces).map(({ name, slug }) => ({ name, folder: (0, dev_team_1.globalWorkspaceFolder)(slug) })),
+            ...Object.values(metadata.apps).map(({ name, folder }) => ({ name, folder: path.join(folder, dev_team_1.APP_WORKSPACE_DIR) })),
+        ];
+        const failed = [];
+        for (const { name, folder } of checkouts) {
+            cli_1.default.log(color_1.default.cyan(`\n━━ ${name} (${folder}) ━━`));
+            const workspaceDir = path.join(rootDir, folder);
+            if (!fs.pathExistsSync(workspaceDir)) {
+                cli_1.default.log(color_1.default.yellow('⚠️  not cloned yet — run fcode team:pull'));
+                failed.push(folder);
+                continue;
+            }
+            try {
+                await (0, workspace_cloner_1.runInWorkspace)(workspaceDir, () => status_1.default.run([]));
+            }
+            catch (error) {
+                cli_1.default.log(color_1.default.red(`❌ ${error.message}`));
+                failed.push(folder);
+            }
         }
-        const local = await this._teamRepository.find();
-        const storedHash = await this.workspaceConfig.getTeamStoredHash();
-        const [raw, versions, aliases] = await Promise.all([
-            this._fcodeGraphQLClient.team(),
-            this._fcodeGraphQLClient.allTeamVersions(),
-            this._fcodeGraphQLClient.allTeamVersionAliases(),
-        ]);
-        const remote = await this._teamRepository.fromRaw(raw);
-        this._teamRepository.applyCloudVersioning(remote, versions, aliases);
-        const localChanged = storedHash !== local.contentHash;
-        const remoteChanged = storedHash !== remote.contentHash;
-        if (localChanged && remoteChanged) {
-            cli_1.default.log(color_1.default.red('🔥 team settings conflict (changed both locally and in the cloud)'));
-        }
-        else if (localChanged) {
-            cli_1.default.log(color_1.default.yellow('🔺 team settings modified locally (run fcode team:push)'));
-        }
-        else if (remoteChanged) {
-            cli_1.default.log(color_1.default.yellow('🔻 team settings out of date (run fcode team:pull)'));
-        }
-        else {
-            cli_1.default.log(color_1.default.green('✅ team settings up to date'));
+        if (failed.length > 0) {
+            process.exitCode = 1;
+            cli_1.default.log(color_1.default.red(`\n${failed.length} workspace(s) could not be checked: ${failed.join(', ')}`));
         }
     }
 }
-TeamStatusCommand.description = 'Show whether team settings (timezone, error handler, inheritance) or team versions/aliases differ from the cloud';
+TeamStatusCommand.description = 'Show what differs from the cloud in every workspace of the development team folder';
 TeamStatusCommand.examples = ['$ fcode team:status'];
 exports.default = TeamStatusCommand;

package/dist/commands/variables/diff.d.ts

@@ -0,0 +1,9 @@
+import VariablesCommand from '../../core/commands/variables-command';
+export default class VariablesDiff extends VariablesCommand {
+    static description: string;
+    static examples: string[];
+    static args: {
+        resourceSlug: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/variables/diff.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const types_1 = require("../../core/types");
+const variables_command_1 = require("../../core/commands/variables-command");
+class VariablesDiff extends variables_command_1.default {
+    async run() {
+        if (await this.resourcesDiff()) {
+            this.exit(1);
+        }
+    }
+}
+VariablesDiff.description = 'Show a unified diff between local variables and the cloud. Sensitive values are never printed. Exits 1 when they differ';
+VariablesDiff.examples = ['$ fcode variables:diff', '$ fcode variables:diff MY_VARIABLE'];
+VariablesDiff.args = types_1.ResourceSlugArg;
+exports.default = VariablesDiff;

package/dist/commands/variables/status.d.ts

@@ -6,6 +6,9 @@ export default class VariablesStatus extends VariablesCommand {
     static args: {
         resourceSlug: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
+    static flags: {
+        showInherited: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
     resourcesTableLog(resources: Array<MergedResource>): Promise<void>;
     private logVariableWarnings;
     run(): Promise<void>;

package/dist/commands/variables/status.js

@@ -66,4 +66,5 @@ class VariablesStatus extends variables_command_1.default {
 VariablesStatus.description = 'List all variables status';
 VariablesStatus.examples = ['$ fcode variables:status'];
 VariablesStatus.args = types_1.ResourceSlugArg;
+VariablesStatus.flags = types_1.ShowInheritedFlag;
 exports.default = VariablesStatus;

package/dist/config/dev-team.d.ts

@@ -0,0 +1,64 @@
+import { CLIError } from '../core/errors';
+/**
+ * The workspace checkout inside an App folder is always called `app`, never after the slug it was
+ * cloned from. The slug is recorded in the metadata, and the directory is only a checkout: pointing
+ * it at another workspace with `fcode remote:add` (dev → prod) must not make its name a lie.
+ */
+export declare const APP_WORKSPACE_DIR = "app";
+/**
+ * The global workspaces the team owns sit together under this folder, one checkout per workspace
+ * named after its slug. A global workspace is one platform team with a fixed slug, so — unlike an
+ * App — there is no name to derive a folder from and nothing to re-point the checkout at.
+ */
+export declare const GLOBAL_WORKSPACES_DIR = "global-workspaces";
+export interface DevTeamApp {
+    name: string;
+    description: string | null;
+    /** Directory holding this App, relative to the team root. Assigned once, then authoritative. */
+    folder: string;
+    /** Workspace the checkout was cloned from. The directory itself is always `APP_WORKSPACE_DIR`. */
+    devWorkspaceSlug: string;
+}
+export interface DevTeamGlobalWorkspace {
+    name: string;
+    description: string;
+    /** Platform team slug; also the checkout's folder name under `GLOBAL_WORKSPACES_DIR`. */
+    slug: string;
+}
+export interface DevTeamMetadata {
+    developmentTeam: {
+        id: string;
+        name: string;
+    };
+    cloudUrl: string;
+    /** Keyed by App id, so a renamed App keeps its folder. */
+    apps: Record<string, DevTeamApp>;
+    /** Keyed by global workspace id. */
+    globalWorkspaces: Record<string, DevTeamGlobalWorkspace>;
+}
+/** Where a global workspace is checked out, relative to the team root. */
+export declare function globalWorkspaceFolder(slug: string): string;
+export declare class NotDevTeamFolder extends CLIError {
+    constructor();
+}
+export default class DevTeamConfig {
+    private readonly rootDir;
+    constructor(rootDir?: string);
+    get configPath(): string;
+    exists(): boolean;
+    read(): DevTeamMetadata;
+    write(metadata: DevTeamMetadata): void;
+}
+/** The App metadata committed inside each App folder, so the folder says what it holds. */
+export interface AppSettings {
+    id: string;
+    name: string;
+    description: string | null;
+}
+/**
+ * Same name as the workspace settings file one level below, deliberately: each level's
+ * `settings.json` describes the thing that level holds. They never collide — this one sits in the
+ * App folder, the workspace's inside `APP_WORKSPACE_DIR`.
+ */
+export declare const APP_SETTINGS_FILENAME = "settings.json";
+export declare function writeAppSettings(appDir: string, app: AppSettings): void;

package/dist/config/dev-team.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.APP_SETTINGS_FILENAME = exports.NotDevTeamFolder = exports.GLOBAL_WORKSPACES_DIR = exports.APP_WORKSPACE_DIR = void 0;
+exports.globalWorkspaceFolder = globalWorkspaceFolder;
+exports.writeAppSettings = writeAppSettings;
+const fs = require("fs-extra");
+const path = require("node:path");
+const errors_1 = require("../core/errors");
+/**
+ * `.fcode/team.json` at the root of a development-team checkout: what `fcode team:clone` writes
+ * and what `team:pull` / `team:status` recognise the folder by.
+ *
+ * Not to be confused with a workspace's `settings.json` (the file that used to be called
+ * `team.json`): this one describes the *development team* — the humans, the Apps they own and the
+ * global workspaces they maintain — and lives one level above the workspaces, inside `.fcode/`.
+ */
+const DEV_TEAM_CONFIG_PATH = path.join('.fcode', 'team.json');
+/**
+ * The workspace checkout inside an App folder is always called `app`, never after the slug it was
+ * cloned from. The slug is recorded in the metadata, and the directory is only a checkout: pointing
+ * it at another workspace with `fcode remote:add` (dev → prod) must not make its name a lie.
+ */
+exports.APP_WORKSPACE_DIR = 'app';
+/**
+ * The global workspaces the team owns sit together under this folder, one checkout per workspace
+ * named after its slug. A global workspace is one platform team with a fixed slug, so — unlike an
+ * App — there is no name to derive a folder from and nothing to re-point the checkout at.
+ */
+exports.GLOBAL_WORKSPACES_DIR = 'global-workspaces';
+/** Where a global workspace is checked out, relative to the team root. */
+function globalWorkspaceFolder(slug) {
+    return path.join(exports.GLOBAL_WORKSPACES_DIR, slug);
+}
+class NotDevTeamFolder extends errors_1.CLIError {
+    constructor() {
+        super('⚠️  Current directory is not a Factorial Code development team folder.', {
+            code: 'ERR_NOT_DEV_TEAM_FOLDER',
+            exit: 1,
+            suggestions: ['fcode team:clone', 'cd <development-team-folder>'],
+        });
+    }
+}
+exports.NotDevTeamFolder = NotDevTeamFolder;
+class DevTeamConfig {
+    constructor(rootDir = process.cwd()) {
+        this.rootDir = rootDir;
+    }
+    get configPath() {
+        return path.join(this.rootDir, DEV_TEAM_CONFIG_PATH);
+    }
+    exists() {
+        return fs.pathExistsSync(this.configPath);
+    }
+    read() {
+        if (!this.exists()) {
+            throw new NotDevTeamFolder();
+        }
+        const metadata = fs.readJsonSync(this.configPath);
+        // A team folder cloned before global workspaces were part of it has no entry; the next
+        // team:pull then clones them the way it clones Apps added since the last run.
+        return { ...metadata, globalWorkspaces: metadata.globalWorkspaces ?? {} };
+    }
+    write(metadata) {
+        fs.outputJsonSync(this.configPath, metadata, { spaces: 2 });
+    }
+}
+exports.default = DevTeamConfig;
+/**
+ * Same name as the workspace settings file one level below, deliberately: each level's
+ * `settings.json` describes the thing that level holds. They never collide — this one sits in the
+ * App folder, the workspace's inside `APP_WORKSPACE_DIR`.
+ */
+exports.APP_SETTINGS_FILENAME = 'settings.json';
+function writeAppSettings(appDir, app) {
+    fs.outputJsonSync(path.join(appDir, exports.APP_SETTINGS_FILENAME), app, { spaces: 2 });
+}

package/dist/config/workspace.d.ts

@@ -19,8 +19,8 @@ declare class WorkspaceConfig extends Config {
     exists(resourceType: string, slug: string): Promise<boolean>;
     getInAnyTeam(resourceType: string, slug: string): Promise<Resource | null>;
     getStoredHash(resource: Resource): Promise<string>;
-    getTeamStoredHash(): Promise<string | undefined>;
-    setTeamStoredHash(contentHash: string): Promise<void>;
+    getSettingsStoredHash(): Promise<string | undefined>;
+    setSettingsStoredHash(contentHash: string): Promise<void>;
     add(resourceType: string, resourceMetadata: ResourceMetadata): Promise<void>;
     remove(resourceType: string, slug: string): Promise<void>;
 }

package/dist/config/workspace.js

@@ -132,10 +132,12 @@ class WorkspaceConfig extends index_1.default {
         const metadata = (await this.getCollectionByClass(await this.getActiveTeam(), resource))[resource.slug];
         return metadata?.contentHash;
     }
-    async getTeamStoredHash() {
+    // The `team` key keeps its name on disk: the hash is computed over the settings content, not the
+    // file name, so reusing it keeps every already-cloned workspace from reporting a phantom conflict.
+    async getSettingsStoredHash() {
         return (await this.getActiveTeam()).team?.contentHash;
     }
-    async setTeamStoredHash(contentHash) {
+    async setSettingsStoredHash(contentHash) {
         const team = await this.getActiveTeam();
         await this.setTeam({ ...team, team: { contentHash } });
     }

package/dist/core/commands/base-command.js

@@ -14,6 +14,11 @@ class BaseCommand extends core_1.Command {
         this.sessionRefreshRetried = false;
     }
     async catch(error) {
+        // `this.exit(code)` is a control-flow signal, not a failure: swallowing it here would print
+        // "EEXIT: 1" and let the process end with a success code. bin/run hands it to oclif's handle().
+        if (error instanceof core_1.Errors.ExitError) {
+            throw error;
+        }
         // do any extra work with error
         if (error && error.response && error.response.status === 401) {
             process.exitCode = 1;

package/dist/core/commands/dependency-command.d.ts

@@ -1,5 +1,6 @@
-import { ProgrammingLanguageManifest } from '../types';
+import { ProgrammingLanguage, ProgrammingLanguageManifest, VersionedProgrammingLanguageManifest } from '../types';
 import ResourceCommand from './resource-command';
 export default abstract class DependencyCommand extends ResourceCommand<ProgrammingLanguageManifest> {
+    _versionedResourceQuery: (programmingLanguage: ProgrammingLanguage) => Promise<Array<VersionedProgrammingLanguageManifest> | null>;
     init(): Promise<void>;
 }

package/dist/core/commands/dependency-command.js

@@ -4,6 +4,7 @@ const programming_language_manifest_1 = require("../../repositories/programming-
 const resource_merger_1 = require("../resource-merger");
 const resource_pusher_1 = require("../resource-pusher");
 const resource_command_1 = require("./resource-command");
+const resource_differ_1 = require("../../services/resource-differ");
 class DependencyCommand extends resource_command_1.default {
     async init() {
         await super.init();
@@ -11,6 +12,8 @@ class DependencyCommand extends resource_command_1.default {
         this._resourceMerger = new resource_merger_1.default(this._resourceRepository);
         this._resourcePusher = new resource_pusher_1.default(this._resourceRepository, this._fcodeGraphQLClient);
         this._resourceQuery = () => this._fcodeGraphQLClient.allProgrammingLanguageManifest.bind(this._fcodeGraphQLClient)();
+        this._versionedResourceQuery = (programmingLanguage) => this._fcodeGraphQLClient.allVersionedDependencies.bind(this._fcodeGraphQLClient)(programmingLanguage);
+        this._diffFilesFor = resource_differ_1.manifestDiffFiles;
     }
 }
 exports.default = DependencyCommand;

package/dist/core/commands/i18n-command.js

@@ -4,6 +4,7 @@ const locale_1 = require("../../repositories/locale");
 const resource_merger_1 = require("../resource-merger");
 const resource_pusher_1 = require("../resource-pusher");
 const resource_command_1 = require("./resource-command");
+const resource_differ_1 = require("../../services/resource-differ");
 class I18nCommand extends resource_command_1.default {
     async init() {
         await super.init();
@@ -11,6 +12,7 @@ class I18nCommand extends resource_command_1.default {
         this._resourceMerger = new resource_merger_1.default(this._resourceRepository);
         this._resourcePusher = new resource_pusher_1.default(this._resourceRepository, this._fcodeGraphQLClient);
         this._resourceQuery = () => this._fcodeGraphQLClient.allLocales.bind(this._fcodeGraphQLClient)();
+        this._diffFilesFor = resource_differ_1.localeDiffFiles;
     }
 }
 exports.default = I18nCommand;