@factorialco/fcode-cli 3.5.0 → 3.6.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g @factorialco/fcode-cli
 $ fcode COMMAND
 running command...
 $ fcode (--version)
-@factorialco/fcode-cli/3.5.0 linux-x64 node-v22.22.3
+@factorialco/fcode-cli/3.6.0 linux-x64 node-v22.23.3
 $ fcode --help [COMMAND]
 USAGE
   $ fcode COMMAND

package/dist/commands/http.d.ts

@@ -14,7 +14,8 @@ export default class Http extends Command {
      * Enforces the webhook's configured auth, simulating the cloud webhook endpoint: the effective
      * configuration names a variable, whose value is looked up in the workspace variables and compared
      * against the configured header. A missing or malformed header, an undefined variable, a mismatch,
-     * or a webhook inheriting a workspace configuration that settings.json does not have, is rejected.
+     * or a webhook inheriting a workspace configuration that is cleared or neither set nor inherited, is
+     * rejected.
      * Returns true when the request may proceed, false after writing a 403.
      */
     private _checkWebhookAuth;

package/dist/commands/http.js

@@ -122,7 +122,8 @@ class Http extends core_1.Command {
      * Enforces the webhook's configured auth, simulating the cloud webhook endpoint: the effective
      * configuration names a variable, whose value is looked up in the workspace variables and compared
      * against the configured header. A missing or malformed header, an undefined variable, a mismatch,
-     * or a webhook inheriting a workspace configuration that settings.json does not have, is rejected.
+     * or a webhook inheriting a workspace configuration that is cleared or neither set nor inherited, is
+     * rejected.
      * Returns true when the request may proceed, false after writing a 403.
      */
     async _checkWebhookAuth(req, res, processRepository, settingsRepository, slug) {
@@ -137,9 +138,10 @@ class Http extends core_1.Command {
         // Read per request, like the process metadata above, so editing settings.json while the server
         // runs takes effect without a restart.
         const teamWebhookAuth = (await settingsRepository.find()).webhookAuth;
+        const inheritedTeamWebhookAuth = settingsRepository.findInherited().webhookAuth;
         let effectiveAuth;
         try {
-            effectiveAuth = (0, webhook_auth_1.resolveEffectiveAuth)(webhook, teamWebhookAuth);
+            effectiveAuth = (0, webhook_auth_1.resolveEffectiveAuth)(webhook, teamWebhookAuth, inheritedTeamWebhookAuth);
         }
         catch (error) {
             // Fails closed, and says why: otherwise this reads as a wrong token rather than a local

package/dist/commands/settings/pull.js

@@ -5,6 +5,7 @@ const api_client_command_1 = require("../../core/commands/api-client-command");
 const settings_1 = require("../../repositories/settings");
 const types_1 = require("../../core/types");
 const cli_1 = require("../../utils/cli");
+const gitignore_1 = require("../../utils/gitignore");
 class SettingsPullCommand extends api_client_command_1.default {
     constructor() {
         super(...arguments);
@@ -32,6 +33,10 @@ class SettingsPullCommand extends api_client_command_1.default {
         const settings = await this._settingsRepository.fromRaw(raw);
         this._settingsRepository.applyCloudVersioning(settings, versions, aliases);
         this._settingsRepository.save(settings);
+        this._settingsRepository.saveInherited(await this._settingsRepository.inheritedFromRaw(raw));
+        // A read-only copy of the parents' values: keep it out of git even when this command runs on
+        // its own rather than inside `fcode pull`.
+        await (0, gitignore_1.syncInheritedGitignore)();
         await this.workspaceConfig.setSettingsStoredHash(settings.contentHash);
     }
 }

package/dist/commands/settings/push.d.ts

@@ -8,6 +8,12 @@ export default class SettingsPushCommand extends ApiClientCommand {
     };
     _settingsRepository: SettingsRepository;
     run(): Promise<void>;
+    /**
+     * A settings.json some CLI synced (there is a stored hash) without marking it inheritance-aware was
+     * written by a CLI older than settings inheritance, with every effective value in it. Only a
+     * workspace with parents is affected: without any, its effective settings are its own.
+     */
+    private pulledByAPreInheritanceCli;
     /** Makes the cloud's versions/aliases match settings.json; returns failed manifest entries. */
     private syncVersioning;
 }

package/dist/commands/settings/push.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const color_1 = require("@oclif/color");
 const api_client_command_1 = require("../../core/commands/api-client-command");
+const errors_1 = require("../../core/errors");
 const settings_1 = require("../../repositories/settings");
 const types_1 = require("../../core/types");
 const team_versioning_1 = require("../../services/team-versioning");
 const cli_1 = require("../../utils/cli");
+const gitignore_1 = require("../../utils/gitignore");
 class SettingsPushCommand extends api_client_command_1.default {
     constructor() {
         super(...arguments);
@@ -23,30 +25,19 @@ class SettingsPushCommand extends api_client_command_1.default {
             cli_1.default.log('Workspace settings already up to date');
             return;
         }
-        const update = { parentTeams: settings.parentTeams };
-        if (settings.zoneId !== undefined) {
-            update.zoneId = settings.zoneId;
+        if (await this.pulledByAPreInheritanceCli(settings, storedHash)) {
+            throw new errors_1.PreInheritanceSettingsFile();
         }
-        if (settings.errorHandlerConfig) {
-            const processId = await this._settingsRepository.resolveSlugToId(settings.errorHandlerConfig.processSlug);
-            update.executionErrorHandlerConfig = { processId, tag: settings.errorHandlerConfig.tag ?? null };
-        }
-        // Sent unconditionally, null arm included: settings.json is the source of truth, so removing
-        // webhookAuth from it must clear the cloud configuration rather than leave it dangling.
-        update.webhookAuth = settings.webhookAuth
-            ? { headerName: settings.webhookAuth.headerName ?? null, variableKey: settings.webhookAuth.variableKey }
-            : { variableKey: null };
-        // Sent unconditionally for the same reason as webhookAuth: settings.json is the source of truth,
-        // so removing primaryLocale from it must clear the cloud setting. Empty string is the clear.
-        update.primaryLocale = settings.primaryLocale ?? '';
-        await this._fcodeGraphQLClient.pushTeam(update);
+        const pushed = await this._fcodeGraphQLClient.pushTeam(await this._settingsRepository.toTeamUpdate(settings));
+        // What the workspace now inherits follows from what was just pushed.
+        this._settingsRepository.saveInherited(await this._settingsRepository.inheritedFromRaw(pushed));
+        // A read-only copy of the parents' values: keep it out of git even when this command runs on
+        // its own rather than inside `fcode pull`.
+        await (0, gitignore_1.syncInheritedGitignore)();
         const failedEntities = await this.syncVersioning(settings, force);
         // Re-read the cloud state so server-assigned fields (createdAt) and declined deletions
         // land back in settings.json, then hash exactly what was written.
-        const [versions, aliases] = await Promise.all([
-            this._fcodeGraphQLClient.allTeamVersions(),
-            this._fcodeGraphQLClient.allTeamVersionAliases(),
-        ]);
+        const [versions, aliases] = await Promise.all([this._fcodeGraphQLClient.allTeamVersions(), this._fcodeGraphQLClient.allTeamVersionAliases()]);
         this._settingsRepository.applyCloudVersioning(settings, versions, aliases);
         this._settingsRepository.save(settings);
         await this.workspaceConfig.setSettingsStoredHash(settings.contentHash);
@@ -57,12 +48,17 @@ class SettingsPushCommand extends api_client_command_1.default {
             this.error(`workspace versions pushed with ${failedEntities} failed entities`, { exit: 1 });
         }
     }
+    /**
+     * A settings.json some CLI synced (there is a stored hash) without marking it inheritance-aware was
+     * written by a CLI older than settings inheritance, with every effective value in it. Only a
+     * workspace with parents is affected: without any, its effective settings are its own.
+     */
+    async pulledByAPreInheritanceCli(settings, storedHash) {
+        return storedHash !== undefined && settings.parentTeams.length > 0 && !(await this.workspaceConfig.isSettingsInheritanceAware());
+    }
     /** Makes the cloud's versions/aliases match settings.json; returns failed manifest entries. */
     async syncVersioning(settings, force) {
-        const [cloudVersions, cloudAliases] = await Promise.all([
-            this._fcodeGraphQLClient.allTeamVersions(),
-            this._fcodeGraphQLClient.allTeamVersionAliases(),
-        ]);
+        const [cloudVersions, cloudAliases] = await Promise.all([this._fcodeGraphQLClient.allTeamVersions(), this._fcodeGraphQLClient.allTeamVersionAliases()]);
         const plan = (0, team_versioning_1.planTeamVersioningSync)(settings, cloudVersions, cloudAliases);
         if ((0, team_versioning_1.teamVersioningSyncPlanIsEmpty)(plan)) {
             return 0;
@@ -96,8 +92,7 @@ class SettingsPushCommand extends api_client_command_1.default {
         return failedEntities;
     }
 }
-SettingsPushCommand.description = 'Update cloud workspace settings (timezone, error handler, inheritance, webhook auth) and sync ' +
-    'workspace versions/aliases from settings.json';
+SettingsPushCommand.description = 'Update cloud workspace settings (timezone, error handler, inheritance, webhook auth) and sync ' + 'workspace versions/aliases from settings.json';
 SettingsPushCommand.examples = ['$ fcode settings:push'];
 SettingsPushCommand.flags = types_1.ForceFlag;
 exports.default = SettingsPushCommand;

package/dist/config/workspace.d.ts

@@ -21,6 +21,12 @@ declare class WorkspaceConfig extends Config {
     getStoredHash(resource: Resource): Promise<string>;
     getSettingsStoredHash(): Promise<string | undefined>;
     setSettingsStoredHash(contentHash: string): Promise<void>;
+    /**
+     * Whether settings.json was last pulled or pushed by a CLI that knows settings inherit. One that
+     * did not wrote the values the workspace inherits as if they were its own, and records the hash
+     * without this mark.
+     */
+    isSettingsInheritanceAware(): Promise<boolean>;
     add(resourceType: string, resourceMetadata: ResourceMetadata): Promise<void>;
     remove(resourceType: string, slug: string): Promise<void>;
 }

package/dist/config/workspace.js

@@ -139,7 +139,15 @@ class WorkspaceConfig extends index_1.default {
     }
     async setSettingsStoredHash(contentHash) {
         const team = await this.getActiveTeam();
-        await this.setTeam({ ...team, team: { contentHash } });
+        await this.setTeam({ ...team, team: { contentHash, inheritanceAware: true } });
+    }
+    /**
+     * Whether settings.json was last pulled or pushed by a CLI that knows settings inherit. One that
+     * did not wrote the values the workspace inherits as if they were its own, and records the hash
+     * without this mark.
+     */
+    async isSettingsInheritanceAware() {
+        return (await this.getActiveTeam()).team?.inheritanceAware === true;
     }
     async add(resourceType, resourceMetadata) {
         const team = await this.getActiveTeam();

package/dist/core/errors.d.ts

@@ -54,6 +54,13 @@ export declare class TeamAccessDenied extends CLIError {
 export declare class NotFcodeWorkspace extends CLIError {
     constructor();
 }
+/**
+ * settings.json was last synced by a CLI older than settings inheritance, which wrote the settings
+ * the workspace inherits as if they were its own: pushing it would stop the workspace inheriting them.
+ */
+export declare class PreInheritanceSettingsFile extends CLIError {
+    constructor();
+}
 export declare class DependenciesNotInstalled extends CLIError {
     constructor(programmingLanguage: ProgrammingLanguage);
 }
@@ -63,3 +70,10 @@ export declare class ProcessDependenciesNotInstalled extends CLIError {
 export declare class ErrorExecutingProcess extends CLIError {
     constructor(message: string);
 }
+/**
+ * The platform answered without the team's inheritable settings: it predates settings inheritance,
+ * and reading its settings would take every one of them for inherited.
+ */
+export declare class PlatformPredatesSettingsInheritance extends CLIError {
+    constructor();
+}

package/dist/core/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ErrorExecutingProcess = exports.ProcessDependenciesNotInstalled = exports.DependenciesNotInstalled = exports.NotFcodeWorkspace = exports.TeamAccessDenied = exports.NotAuthenticated = exports.CloudProgrammingLanguageManifestNotFound = exports.LocalProgrammingLanguageManifestNotFound = exports.CloudLocaleNotFound = exports.LocalLocaleNotFound = exports.CloudVariableNotFound = exports.LocalVariableNotFound = exports.CloudScriptLibraryNotFound = exports.LocalScriptLibraryNotFound = exports.CloudProcessNotFound = exports.LocalProcessNotFound = exports.ResourceNotFound = exports.CLIError = void 0;
+exports.PlatformPredatesSettingsInheritance = exports.ErrorExecutingProcess = exports.ProcessDependenciesNotInstalled = exports.DependenciesNotInstalled = exports.PreInheritanceSettingsFile = exports.NotFcodeWorkspace = exports.TeamAccessDenied = exports.NotAuthenticated = exports.CloudProgrammingLanguageManifestNotFound = exports.LocalProgrammingLanguageManifestNotFound = exports.CloudLocaleNotFound = exports.LocalLocaleNotFound = exports.CloudVariableNotFound = exports.LocalVariableNotFound = exports.CloudScriptLibraryNotFound = exports.LocalScriptLibraryNotFound = exports.CloudProcessNotFound = exports.LocalProcessNotFound = exports.ResourceNotFound = exports.CLIError = void 0;
 exports.teamAccessDeniedMessage = teamAccessDeniedMessage;
 const global_1 = require("../config/global");
 class CLIError extends Error {
@@ -145,6 +145,25 @@ class NotFcodeWorkspace extends CLIError {
     }
 }
 exports.NotFcodeWorkspace = NotFcodeWorkspace;
+/**
+ * settings.json was last synced by a CLI older than settings inheritance, which wrote the settings
+ * the workspace inherits as if they were its own: pushing it would stop the workspace inheriting them.
+ */
+class PreInheritanceSettingsFile extends CLIError {
+    constructor() {
+        super('settings.json was last synced by an fcode CLI that predates settings inheritance: it holds the settings this ' +
+            'workspace inherits from its parent workspaces as if they were its own, and pushing it would stop the ' +
+            'workspace inheriting them.', {
+            code: 'ERR_PRE_INHERITANCE_SETTINGS_FILE',
+            exit: 1,
+            suggestions: [
+                'fcode settings:pull, then push again',
+                'fcode settings:pull --force if settings.json has local changes, then reapply them and push again',
+            ],
+        });
+    }
+}
+exports.PreInheritanceSettingsFile = PreInheritanceSettingsFile;
 class DependenciesNotInstalled extends CLIError {
     constructor(programmingLanguage) {
         super(`Dependencies not installed.`, {
@@ -175,3 +194,18 @@ class ErrorExecutingProcess extends CLIError {
     }
 }
 exports.ErrorExecutingProcess = ErrorExecutingProcess;
+/**
+ * The platform answered without the team's inheritable settings: it predates settings inheritance,
+ * and reading its settings would take every one of them for inherited.
+ */
+class PlatformPredatesSettingsInheritance extends CLIError {
+    constructor() {
+        super('This Factorial Code platform predates settings inheritance, which this fcode CLI requires to read and ' +
+            'push workspace settings.', {
+            code: 'ERR_PLATFORM_PREDATES_SETTINGS_INHERITANCE',
+            exit: 1,
+            suggestions: ['Wait for the platform to be updated, or use an fcode CLI older than 3.6.0 until then'],
+        });
+    }
+}
+exports.PlatformPredatesSettingsInheritance = PlatformPredatesSettingsInheritance;

package/dist/core/executors/javascript-execution-task.js

@@ -606,25 +606,38 @@ const main = typeof _hooksModule['${fn}'] === 'function'
         i18n: Object.assign((key, args, options) => {
           const translations = ${JSON.stringify(metadata.i18n.translations, null, 2)};
           const byLocale = ${JSON.stringify(metadata.i18n.byLocale, null, 2)};
+          const primaryLocale = ${JSON.stringify(metadata.i18n.primaryLocale ?? null)};
           const requested = options && typeof options === 'object' && options.locale !== undefined && options.locale !== null
             ? String(options.locale)
             : undefined;
           // An identifier no locale matches is shortened one segment at a time ('en-gb' reads
-          // 'en'), by name first and ignoring case only as a last resort — the same chain the
-          // cloud resolves, so a local run answers a regional variant the same way.
+          // 'en'), by name first and ignoring case only as a last resort, and a language that
+          // still matches nothing is broadened to a regional locale of it ('es' reads 'es-ES',
+          // the primary one if it is among them, else the alphabetically first) — the same chain
+          // the cloud resolves, so a local run answers the same identifiers the same way.
+          const names = Object.keys(byLocale);
+          const matching = (candidate) => names.includes(candidate)
+            ? candidate
+            : names.filter((name) => name.toLowerCase() === candidate.toLowerCase()).sort()[0];
           const localeMaps = [];
-          for (let candidate = requested; candidate; ) {
-            const names = Object.keys(byLocale);
-            const lowered = candidate.toLowerCase();
-            const match = names.includes(candidate)
-              ? candidate
-              : names.filter((name) => name.toLowerCase() === lowered).sort()[0];
+          const add = (match) => {
             if (match !== undefined && !localeMaps.includes(byLocale[match])) {
               localeMaps.push(byLocale[match]);
             }
+          };
+          let language;
+          for (let candidate = requested; candidate; ) {
+            add(matching(candidate));
+            language = candidate;
             const lastSeparator = Math.max(candidate.lastIndexOf('-'), candidate.lastIndexOf('_'));
             candidate = lastSeparator > 0 ? candidate.slice(0, lastSeparator) : undefined;
           }
+          if (language !== undefined && !/[-_]/.test(language) && matching(language) === undefined) {
+            const sameLanguage = names
+              .filter((name) => name.split(/[-_]/)[0].toLowerCase() === language.toLowerCase())
+              .sort();
+            add(sameLanguage.includes(primaryLocale) ? primaryLocale : sameLanguage[0]);
+          }
           let template;
           for (const localeMap of localeMaps) {
             template = Object.hasOwn(localeMap, key) ? localeMap[key] : undefined;

package/dist/core/types.d.ts

@@ -49,6 +49,7 @@ export interface TeamMetadata {
     };
     team?: {
         contentHash?: string;
+        inheritanceAware?: boolean;
     };
 }
 export interface RemoteMetadata {
@@ -397,24 +398,34 @@ export interface ParentTeamRef {
     slug: string;
     version?: string;
 }
-/** The workspace's settings.json: what `fcode settings:pull|push` syncs against the cloud team. */
+/**
+ * The workspace's settings.json: what `fcode settings:pull|push` syncs against the cloud team. It
+ * holds the team's own values only: an absent setting inherits, and null (error handler and webhook
+ * auth only) clears it, a parent's value included.
+ */
 export declare class WorkspaceSettings extends Resource {
     id: string | undefined;
     slug: string;
     zoneId?: string;
-    errorHandlerConfig?: ErrorHandlerConfig;
+    errorHandlerConfig?: ErrorHandlerConfig | null;
     parentTeams: ParentTeamRef[];
-    webhookAuth?: WebhookAuth;
+    webhookAuth?: WebhookAuth | null;
     primaryLocale?: string;
     versions?: TeamVersionFileEntry[];
     aliases?: TeamAliasFileEntry[];
-    constructor(slug: string, parentTeams: ParentTeamRef[], zoneId?: string, errorHandlerConfig?: ErrorHandlerConfig, webhookAuth?: WebhookAuth, primaryLocale?: string);
+    constructor(slug: string, parentTeams: ParentTeamRef[], zoneId?: string, errorHandlerConfig?: ErrorHandlerConfig | null, webhookAuth?: WebhookAuth | null, primaryLocale?: string);
     get contentHash(): string;
 }
 export interface RawErrorHandlerConfig {
     processId: string;
     tag?: string | null;
 }
+export type InheritableSetting = 'ERROR_HANDLER' | 'PARAMS_SCHEMA_VALIDATION' | 'PRIMARY_LOCALE' | 'WEBHOOK_AUTH' | 'ZONE_ID';
+export type SettingMode = 'INHERIT' | 'NONE' | 'OWN';
+export interface SettingOrigin {
+    mode: SettingMode;
+    from?: string | null;
+}
 export interface RawTeamSettings {
     slug: string;
     zoneId?: string;
@@ -422,16 +433,34 @@ export interface RawTeamSettings {
     parentTeams: ParentTeamRef[];
     webhookAuth?: WebhookAuth | null;
     primaryLocale?: string | null;
+    origins?: Record<InheritableSetting, SettingOrigin>;
 }
-export interface TeamUpdateInput {
+export interface InheritedWorkspaceSettings {
     zoneId?: string;
-    parentTeams?: ParentTeamRef[];
-    executionErrorHandlerConfig?: RawErrorHandlerConfig | null;
-    webhookAuth?: {
-        headerName?: string | null;
-        variableKey?: string | null;
-    } | null;
+    errorHandlerConfig?: ErrorHandlerConfig;
+    webhookAuth?: WebhookAuth;
     primaryLocale?: string;
+    inheritedFrom: Record<string, string>;
+}
+export type SettingInput<T> = {
+    mode: 'INHERIT';
+} | {
+    mode: 'NONE';
+} | {
+    mode: 'OWN';
+    value: T;
+};
+export interface TeamUpdateInput {
+    parentTeams?: ParentTeamRef[];
+    inheritableSettings?: {
+        zoneId?: SettingInput<string>;
+        errorHandlerConfig?: SettingInput<RawErrorHandlerConfig>;
+        webhookAuth?: SettingInput<{
+            headerName?: string | null;
+            variableKey: string;
+        }>;
+        primaryLocale?: SettingInput<string>;
+    };
 }
 export type ResourceMetadata = {
     [key: string]: any;

package/dist/core/types.js

@@ -261,7 +261,11 @@ class ProgrammingLanguageManifest extends Resource {
     }
 }
 exports.ProgrammingLanguageManifest = ProgrammingLanguageManifest;
-/** The workspace's settings.json: what `fcode settings:pull|push` syncs against the cloud team. */
+/**
+ * The workspace's settings.json: what `fcode settings:pull|push` syncs against the cloud team. It
+ * holds the team's own values only: an absent setting inherits, and null (error handler and webhook
+ * auth only) clears it, a parent's value included.
+ */
 class WorkspaceSettings extends Resource {
     constructor(slug, parentTeams, zoneId, errorHandlerConfig, webhookAuth, primaryLocale) {
         super();
@@ -293,6 +297,14 @@ class WorkspaceSettings extends Resource {
         if (this.primaryLocale) {
             payload.primaryLocale = this.primaryLocale;
         }
+        // Cleared settings hash apart from inherited ones; inserted only when any is cleared.
+        const cleared = [
+            ...(this.errorHandlerConfig === null ? ['ERROR_HANDLER'] : []),
+            ...(this.webhookAuth === null ? ['WEBHOOK_AUTH'] : []),
+        ];
+        if (cleared.length > 0) {
+            payload.cleared = cleared;
+        }
         // Versions hash only their tags and aliases their name->tag pairs: createdAt is
         // server-assigned and a comment is immutable once published (there is no update mutation),
         // so neither can represent a pushable local change. Inserted only when non-empty, again to

package/dist/repositories/settings.d.ts

@@ -1,6 +1,7 @@
-import { RawTeamSettings, TeamVersion, TeamVersionAlias, WorkspaceSettings } from '../core/types';
+import { InheritedWorkspaceSettings, RawTeamSettings, TeamUpdateInput, TeamVersion, TeamVersionAlias, WorkspaceSettings } from '../core/types';
 import WorkspaceConfig from '../config/workspace';
 export declare const SETTINGS_FILENAME = "settings.json";
+export declare const INHERITED_SETTINGS_FILENAME = "settings.inherited.json";
 /**
  * Workspaces cloned before the file was renamed carry team.json. Renaming it on first access keeps
  * the stored sync hash valid (it is computed over the content, not the name), so the workspace does
@@ -22,8 +23,23 @@ export default class SettingsRepository {
     exists(): boolean;
     find(): Promise<WorkspaceSettings>;
     save(settings: WorkspaceSettings): void;
-    /** Builds the settings from the cloud's raw payload, resolving the error-handler id to a slug. */
+    /** The settings a local run inherits; empty when the workspace inherits none. */
+    findInherited(): InheritedWorkspaceSettings;
+    /** Writes settings.inherited.json, or removes it when the workspace inherits no setting. */
+    saveInherited(inherited: InheritedWorkspaceSettings | undefined): void;
+    /**
+     * Builds the settings.json view of the cloud's raw payload: only the team's own values, null for a
+     * cleared setting, and nothing for an inherited or default one. Resolves the error-handler id to a
+     * slug.
+     */
     fromRaw(raw: RawTeamSettings): Promise<WorkspaceSettings>;
+    /** The settings.inherited.json view of the cloud's raw payload; undefined when nothing is inherited. */
+    inheritedFromRaw(raw: RawTeamSettings): Promise<InheritedWorkspaceSettings | undefined>;
+    /**
+     * settings.json is the source of truth for the team's own values: a setting absent from it is
+     * reset to inherit, null leaves the team with none (a parent's included), and a value sets it.
+     */
+    toTeamUpdate(settings: WorkspaceSettings): Promise<TeamUpdateInput>;
     /**
      * Writes the cloud's workspace versions and aliases into the settings as the settings.json
      * versioning fields (sorted for stable git diffs). Cloud entries always carry a createdAt; only
@@ -32,6 +48,10 @@ export default class SettingsRepository {
     applyCloudVersioning(settings: WorkspaceSettings, versions: TeamVersion[], aliases: TeamVersionAlias[]): void;
     resolveSlugToId(processSlug: string): Promise<string>;
     resolveIdToSlug(processId: string): Promise<string>;
+    /** Where each setting comes from; an API without it predates settings inheritance. */
+    private originsOf;
+    private resolveErrorHandler;
+    private parseString;
     private parseErrorHandler;
     /**
      * settings.json is hand-edited to declare versions, so entries without a tag are dropped and a