orkestrator 2.26.1-alpha → 2.26.2-beta

package/dist/client.js

@@ -7444,7 +7444,7 @@ import path4 from "path";
 // ../../apps/backend/package.json
 var package_default = {
   name: "@orkestrator/backend",
-  version: "2.26.1-alpha",
+  version: "2.26.2-beta",
   private: true,
   type: "module",
   exports: {
@@ -7458,7 +7458,7 @@ var package_default = {
     "start:web": "bun dist/main.js --fallback-host 127.0.0.1",
     "start:web-public": "bun dist/main.js --tailscale-serve --allowed-origins https://orkestrator.dev,https://www.orkestrator.dev",
     test: "bun test --preload ../../tests/setup-node.ts src tests --parallel",
-    "test:workspace": "bun test --preload ../../tests/setup-node.ts src tests --only-failures ${ORKESTRATOR_TEST_TIMINGS_DIR:+--timings=$ORKESTRATOR_TEST_TIMINGS_DIR/backend.json --update-timings} --parallel=${ORKESTRATOR_TEST_WORKERS:-2}",
+    "test:workspace": "bun test --preload ../../tests/setup-node.ts src tests --only-failures ${ORKESTRATOR_TEST_TIMINGS_DIR:+--timings=$ORKESTRATOR_TEST_TIMINGS_DIR/backend.json --update-timings} $ORKESTRATOR_BACKEND_TEST_IGNORE --parallel=${ORKESTRATOR_BACKEND_TEST_WORKERS:-${ORKESTRATOR_TEST_WORKERS:-2}}",
     typecheck: "bunx tsc --noEmit -p tsconfig.json && bunx tsc --noEmit -p tsconfig.test.json"
   },
   dependencies: {

package/dist/main.js

@@ -818,7 +818,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@orkestrator/backend",
-    version: "2.26.1-alpha",
+    version: "2.26.2-beta",
     private: true,
     type: "module",
     exports: {
@@ -832,7 +832,7 @@ var init_package = __esm(() => {
       "start:web": "bun dist/main.js --fallback-host 127.0.0.1",
       "start:web-public": "bun dist/main.js --tailscale-serve --allowed-origins https://orkestrator.dev,https://www.orkestrator.dev",
       test: "bun test --preload ../../tests/setup-node.ts src tests --parallel",
-      "test:workspace": "bun test --preload ../../tests/setup-node.ts src tests --only-failures ${ORKESTRATOR_TEST_TIMINGS_DIR:+--timings=$ORKESTRATOR_TEST_TIMINGS_DIR/backend.json --update-timings} --parallel=${ORKESTRATOR_TEST_WORKERS:-2}",
+      "test:workspace": "bun test --preload ../../tests/setup-node.ts src tests --only-failures ${ORKESTRATOR_TEST_TIMINGS_DIR:+--timings=$ORKESTRATOR_TEST_TIMINGS_DIR/backend.json --update-timings} $ORKESTRATOR_BACKEND_TEST_IGNORE --parallel=${ORKESTRATOR_BACKEND_TEST_WORKERS:-${ORKESTRATOR_TEST_WORKERS:-2}}",
       typecheck: "bunx tsc --noEmit -p tsconfig.json && bunx tsc --noEmit -p tsconfig.test.json"
     },
     dependencies: {
@@ -3220,6 +3220,79 @@ var init_resource_events = __esm(() => {
   RESOURCE_MANIFEST_KIND_SET = new Set(RESOURCE_MANIFEST_KINDS);
 });
 
+// ../protocol/src/controller-settings.ts
+function pickInheritedGlobalSettings(global2) {
+  const source = global2;
+  const picked = {};
+  for (const key of INHERITED_GLOBAL_SETTING_KEYS) {
+    if (source[key] !== undefined)
+      picked[key] = source[key];
+  }
+  return picked;
+}
+function parseInheritedGlobalSettings(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value) || Object.getPrototypeOf(value) !== Object.prototype && Object.getPrototypeOf(value) !== null) {
+    throw new Error("Expected settings to be an object.");
+  }
+  let serialized;
+  try {
+    serialized = JSON.stringify(value);
+  } catch {
+    throw new Error("Settings must be plain JSON.");
+  }
+  if (new TextEncoder().encode(serialized).byteLength > MAX_INHERITED_SETTINGS_BYTES) {
+    throw new Error("Settings are too large.");
+  }
+  const parsed = JSON.parse(serialized);
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error("Expected settings to be an object.");
+  }
+  return pickInheritedGlobalSettings(parsed);
+}
+function emptyControllerSettingsStore() {
+  return { version: 1, entries: [] };
+}
+function parseControllerSettingsStore(value) {
+  if (!value || typeof value !== "object")
+    return emptyControllerSettingsStore();
+  const entries = value.entries;
+  if (!Array.isArray(entries))
+    return emptyControllerSettingsStore();
+  const parsed = [];
+  for (const entry of entries) {
+    if (!entry || typeof entry !== "object")
+      continue;
+    const record = entry;
+    if (!isBackendId(record.controllerId) || typeof record.changedAt !== "string" || !Number.isFinite(Date.parse(record.changedAt)))
+      continue;
+    try {
+      parsed.push({
+        controllerId: record.controllerId,
+        settings: parseInheritedGlobalSettings(record.settings),
+        changedAt: record.changedAt
+      });
+    } catch {}
+  }
+  return { version: 1, entries: parsed };
+}
+var SYNC_CONTROLLER_SETTINGS_COMMAND = "sync_controller_settings", INHERITED_GLOBAL_SETTING_KEYS, MAX_INHERITED_SETTINGS_BYTES, INHERITED_KEYS;
+var init_controller_settings = __esm(() => {
+  init_federation();
+  INHERITED_GLOBAL_SETTING_KEYS = [
+    "agentSettings",
+    "favoriteModels",
+    "reviewInstruction",
+    "openCodeModelProviders",
+    "codexMaxConcurrentThreads",
+    "claudeBackgroundCommandLimitHours",
+    "terminalAppearance",
+    "terminalScrollback",
+    "agentMessaging"
+  ];
+  MAX_INHERITED_SETTINGS_BYTES = 256 * 1024;
+  INHERITED_KEYS = new Set(INHERITED_GLOBAL_SETTING_KEYS);
+});
+
 // ../../apps/backend/src/core/github-cli-binary.ts
 function setManagedGitHubCli(executable) {
   managedGitHubCli = executable;
@@ -3967,7 +4040,7 @@ var SYSTEM_INSTRUCTIONS_FRAME_OPEN = "<orkestrator-system-instructions>", SYSTEM
 1. Inspect the current Git status and changes. Commit only relevant safe changes using the repository's commit conventions and hooks. Never skip hooks, force a clean tree, delete unrelated files, push, merge, rebase, reset, switch branches, or create a worktree. Do not implement features or fix validation failures. If unrelated or sensitive changes prevent a clean worktree, report the limitation.
 2. Discover validation requirements afresh from the CURRENT repository. First read the repository's agent instructions \u2014 AGENTS.md (and CLAUDE.md or an equivalent) at the root and in the directories that contain changed paths, plus any testing guide they point to \u2014 and follow what they say about which tests, checks, and builds a given kind of change needs. Then use directory structure, changed paths, CI workflows, manifests, task definitions, toolchain configuration, and relevant scripts. Do not assume a language, package manager, fixed list of files, or that the codebase resembles an earlier review. Follow repository-specific test entrypoints. Do not infer that a command covers another merely from its name.
 3. Select validation proportionate to the change. Produce at most 32 commands covering the tests, static checks, and build that the changed paths can affect, plus any repository-specific requirements. Some suites are only needed in some situations: when the repository instructions scope a suite to particular paths, platforms, or kinds of change, include it only when this change meets that condition, and omit suites for areas the change cannot affect (for example a documentation-only change does not need an unrelated app's test suite). Include the full relevant coverage when the instructions require it for every change, or when a change's reach is uncertain (shared configuration, dependencies, lockfiles, toolchain, or code shared across areas). Summarize deliberately omitted suites and why in one concise limitation. Do not RUN validation, install dependencies, inspect validation output, or perform the code review. Command execution, timing, artifact paths, and exit codes belong to the backend. A skipped requirement needs an explicit limitation; an empty plan requires a limitation.
-4. Each command has a unique short id, a non-interactive shell command, a workspace-relative cwd (usually "."), and dependsOn listing prerequisite ids EARLIER in the array. Split independent work so it can run concurrently. Inspect what each selected stage actually runs before adding another command: if the full test stage already runs the production build, omit a separate build command instead of repeating it. Shared build prerequisites run once; avoid overlapping aggregate commands that repeat the same validation. Preserve necessary build/test dependencies and setup/cleanup semantics. Prefer a repository-owned one-shot lifecycle task for service-backed checks. Never place a foreground server/supervisor before its dependent tests in a sequential shell command: readiness output does not mean that the starter exits. Only when no repository-owned lifecycle task exists may tightly coupled setup, test, and cleanup use a shell trap, with explicit readiness, bounded waits, supervision, and cleanup.
+4. Each command has a unique short id, a non-interactive shell command, a workspace-relative cwd (usually "."), and dependsOn listing prerequisite ids EARLIER in the array. Split independent work so it can run concurrently. Inspect what each selected stage actually runs before adding another command: if the full test stage already runs the production build, omit a separate build command instead of repeating it. Shared build prerequisites run once; avoid overlapping aggregate commands that repeat the same validation. List each command once: never plan the same command twice, such as a cold and a warm run or a confirmation rerun, because every command already runs exactly once against the committed snapshot and the backend records any repeat as covered by its first copy. Preserve necessary build/test dependencies and setup/cleanup semantics. Prefer a repository-owned one-shot lifecycle task for service-backed checks. Never place a foreground server/supervisor before its dependent tests in a sequential shell command: readiness output does not mean that the starter exits. Only when no repository-owned lifecycle task exists may tightly coupled setup, test, and cleanup use a shell trap, with explicit readiness, bounded waits, supervision, and cleanup.
 5. resources names directories or shared services the command writes or consumes exclusively (for example a generated output directory, test database, or simulator). Commands with the same resource serialize. Use workspace: prefixes for workspace directories and services (for example workspace:dist); use ["workspace:*"] when interference within this workspace is uncertain. Use host: prefixes for genuinely host-shared resources (for example host:tcp:1422 or host:ios-simulator), and ["host:*"] only when host-wide interference is uncertain. Legacy unprefixed resource names and ["*"] retain host-wide scope for compatibility: do not use them for workspace-only uncertainty. Empty resources means you have verified parallel safety. weight=2 marks internally parallel or memory-heavy work and weight=1 lighter work; weight only sizes a command until its real CPU use has been measured, and the host starts commands with partial capacity when busy. Do not guess a command is lightweight. timeoutMs must be between 1000 and 7200000 and appropriate to this project. Never request watch mode, interactive input, background servers without cleanup, or a detached process. If .orkestrator-test-scheduler.json is present, its cooperativeCommands are eligible alternatives, NOT a checklist. Select only the required coverage, using each selected command verbatim from cwd="." without shell wrappers or compound commands; those runners reserve their own host capacity. Select repository-owned commandProfiles entries verbatim from cwd="." as separate commands too; do not synthesize setup/test/cleanup wrappers around an available one-shot task. Only cooperativeCommands reserve their own capacity; ordinary profiled commands are admitted by the review worker. Follow exact commandProfiles resource and coverage declarations when present. A profile covers list declares commands whose validation is already included: choose the covering command once instead of also scheduling its covered alternatives. Waiting for capacity does not count against timeoutMs.
 6. Read the final full HEAD commit SHA into headRef. Commands run against that HEAD. Generated or untracked files created during validation are recorded as environment state changes and do not block the review. Include actual missing prerequisites and coverage uncertainty in limitations. Do not include secrets or environment-variable values in the plan.
 
@@ -19837,9 +19910,11 @@ var init_storage_projects = __esm(() => {
 
 // ../../apps/backend/src/core/storage-config.ts
 import path20 from "path";
+import { isDeepStrictEqual as isDeepStrictEqual2 } from "util";
 var StorageConfig;
 var init_storage_config = __esm(() => {
   init_coordinator_web_research();
+  init_controller_settings();
   init_agent_settings();
   init_debug_logging();
   init_notification_sounds();
@@ -19849,7 +19924,55 @@ var init_storage_config = __esm(() => {
   init_storage_shared();
   init_storage_projects();
   StorageConfig = class StorageConfig extends StorageProjects {
+    inheritedGlobalSettings = null;
     async loadConfig() {
+      return this.withInheritedSettings(await this.loadOwnConfig());
+    }
+    announceInheritedSettingsChanged() {
+      this.announce("config", "app");
+    }
+    withInheritedSettings(config) {
+      const inherited = this.inheritedGlobalSettings?.() ?? null;
+      if (!inherited)
+        return config;
+      const values = { ...config.global };
+      const defaults = defaultConfig().global;
+      for (const key of INHERITED_GLOBAL_SETTING_KEYS) {
+        delete values[key];
+        if (defaults[key] !== undefined)
+          values[key] = defaults[key];
+      }
+      const global2 = { ...values, ...inherited };
+      const agentSettings = normalizeAgentSettings(global2.agentSettings);
+      const enabled = normalizeAgentPlatforms(global2.enabledAgentPlatforms, []);
+      global2.agentSettings = enabled.length > 0 ? {
+        ...agentSettings,
+        defaultAgent: firstEnabledAgentPlatform(enabled, agentSettings.defaultAgent)
+      } : agentSettings;
+      return { ...config, global: global2 };
+    }
+    keepOwnInheritedValues(incoming, own) {
+      const inherited = this.inheritedGlobalSettings?.() ?? null;
+      if (!inherited)
+        return incoming;
+      const effective = this.withInheritedSettings({
+        version: "",
+        global: own,
+        repositories: {}
+      }).global;
+      const next = { ...incoming };
+      const ownValues = own;
+      for (const key of INHERITED_GLOBAL_SETTING_KEYS) {
+        if (!isDeepStrictEqual2(next[key], effective[key]))
+          continue;
+        if (ownValues[key] === undefined)
+          delete next[key];
+        else
+          next[key] = ownValues[key];
+      }
+      return next;
+    }
+    async loadOwnConfig() {
       const configExists = await fs6.access(this.configFile()).then(() => true, () => false);
       const config = await this.loadJsonCached(this.configFile(), defaultConfig);
       const normalized = normalizePersistedConfig(config);
@@ -19887,17 +20010,19 @@ var init_storage_config = __esm(() => {
     async saveConfig(config, options2 = {}) {
       const validated = validateConfigReviewInstruction(config);
       await this.enqueueConfigMutation(async () => {
-        const current = options2.preserveCredentials ? await this.loadConfig() : null;
+        const own = await this.loadOwnConfig();
+        const current = options2.preserveCredentials ? own : null;
+        const ownGlobal = this.keepOwnInheritedValues(validated.global, own.global);
         const next = current ? {
           ...validated,
           global: {
-            ...validated.global,
+            ...ownGlobal,
             ...current.global.githubToken ? { githubToken: current.global.githubToken } : {},
             ...current.global.anthropicApiKey ? { anthropicApiKey: current.global.anthropicApiKey } : {},
             ...current.global.cursorApiKey ? { cursorApiKey: current.global.cursorApiKey } : {},
             ...current.global.openCodeZenApiKey ? { openCodeZenApiKey: current.global.openCodeZenApiKey } : {}
           }
-        } : validated;
+        } : { ...validated, global: ownGlobal };
         await this.saveSensitiveJson(this.configFile(), next);
       });
       this.announce("config", "app");
@@ -19985,7 +20110,7 @@ var init_storage_config = __esm(() => {
     async saveDesktopConnections(desktopConnections) {
       const validated = parseStoredDesktopConnections(desktopConnections);
       await this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         config.desktopConnections = validated;
         await this.saveSensitiveJson(this.configFile(), config);
       });
@@ -19997,16 +20122,16 @@ var init_storage_config = __esm(() => {
     }
     async updateRepositoryConfig(projectId, repoConfig) {
       return this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         config.repositories[projectId] = { ...defaultRepositoryConfig(), ...repoConfig };
         await this.saveSensitiveJson(this.configFile(), config);
         this.announce("config", "app");
-        return config;
+        return this.withInheritedSettings(config);
       });
     }
     async updateRepositorySettings(projectId, repoConfig) {
       return this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         const current = config.repositories[projectId] ?? defaultRepositoryConfig();
         const userSettings = { ...repoConfig };
         delete userSettings.lastEnvironmentType;
@@ -20021,12 +20146,12 @@ var init_storage_config = __esm(() => {
         };
         await this.saveSensitiveJson(this.configFile(), config);
         this.announce("config", "app");
-        return config;
+        return this.withInheritedSettings(config);
       });
     }
     async patchRepositoryConfig(projectId, updates) {
       return this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         const current = config.repositories[projectId] ?? defaultRepositoryConfig();
         config.repositories[projectId] = {
           ...defaultRepositoryConfig(),
@@ -20035,7 +20160,7 @@ var init_storage_config = __esm(() => {
         };
         await this.saveSensitiveJson(this.configFile(), config);
         this.announce("config", "app");
-        return config;
+        return this.withInheritedSettings(config);
       });
     }
     async updateGlobalConfig(globalConfig, options2 = {}) {
@@ -20091,7 +20216,7 @@ var init_storage_config = __esm(() => {
         }
       };
       return this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         validated.coordinatorProviderTierDefaultVersion = Math.max(validated.coordinatorProviderTierDefaultVersion ?? COORDINATOR_PROVIDER_TIER_DEFAULT_VERSION, normalizeCoordinatorProviderTierDefaultVersion(config.global.coordinatorProviderTierDefaultVersion));
         if (validated.mcpManagement === undefined && config.global.mcpManagement !== undefined)
           validated.mcpManagement = config.global.mcpManagement;
@@ -20105,21 +20230,29 @@ var init_storage_config = __esm(() => {
           validated.githubCliReminderDismissed = true;
         else
           delete validated.githubCliReminderDismissed;
+        const ownGlobal = this.keepOwnInheritedValues(validated, config.global);
+        if (options2.preserveInheritedSettings) {
+          for (const key of INHERITED_GLOBAL_SETTING_KEYS) {
+            delete ownGlobal[key];
+            if (config.global[key] !== undefined)
+              Object.assign(ownGlobal, { [key]: config.global[key] });
+          }
+        }
         config.global = options2.preserveCredentials ? {
-          ...validated,
+          ...ownGlobal,
           ...config.global.githubToken ? { githubToken: config.global.githubToken } : {},
           ...config.global.anthropicApiKey ? { anthropicApiKey: config.global.anthropicApiKey } : {},
           ...config.global.cursorApiKey ? { cursorApiKey: config.global.cursorApiKey } : {},
           ...config.global.openCodeZenApiKey ? { openCodeZenApiKey: config.global.openCodeZenApiKey } : {}
-        } : validated;
+        } : ownGlobal;
         await this.saveSensitiveJson(this.configFile(), config);
         this.announce("config", "app");
-        return config;
+        return this.withInheritedSettings(config);
       });
     }
     async updateWorktreeLocations(locations) {
       return this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         const next = {
           ...locations.environments ? { environments: locations.environments } : {},
           ...locations.dev ? { dev: locations.dev } : {}
@@ -20130,89 +20263,89 @@ var init_storage_config = __esm(() => {
           delete config.global.worktreeLocations;
         await this.saveSensitiveJson(this.configFile(), config);
         this.announce("config", "app");
-        return config;
+        return this.withInheritedSettings(config);
       });
     }
     async updateMcpManagementRollout(settings) {
       return this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         config.global = { ...config.global, mcpManagement: settings };
         await this.saveSensitiveJson(this.configFile(), config);
         this.announce("config", "app");
-        return config;
+        return this.withInheritedSettings(config);
       });
     }
     async updateNotificationSoundSettings(settings) {
       const notificationSounds = normalizeNotificationSoundSettings(settings);
       return this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         config.global = {
           ...config.global,
           notificationSounds
         };
         await this.saveSensitiveJson(this.configFile(), config);
         this.announce("config", "app");
-        return config;
+        return this.withInheritedSettings(config);
       });
     }
     async setGitHubCliReminderDismissed(dismissed) {
       return this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         if (dismissed)
           config.global.githubCliReminderDismissed = true;
         else
           delete config.global.githubCliReminderDismissed;
         await this.saveSensitiveJson(this.configFile(), config);
         this.announce("config", "app");
-        return config;
+        return this.withInheritedSettings(config);
       });
     }
     async setGitHubToken(token) {
       return this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         if (token === null)
           delete config.global.githubToken;
         else
           config.global.githubToken = token;
         await this.saveSensitiveJson(this.configFile(), config);
         this.announce("config", "app");
-        return config;
+        return this.withInheritedSettings(config);
       });
     }
     async setCursorApiKey(apiKey) {
       return this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         if (apiKey === null)
           delete config.global.cursorApiKey;
         else
           config.global.cursorApiKey = apiKey;
         await this.saveSensitiveJson(this.configFile(), config);
         this.announce("config", "app");
-        return config;
+        return this.withInheritedSettings(config);
       });
     }
     async setAnthropicApiKey(apiKey) {
       return this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         if (apiKey === null)
           delete config.global.anthropicApiKey;
         else
           config.global.anthropicApiKey = apiKey;
         await this.saveSensitiveJson(this.configFile(), config);
         this.announce("config", "app");
-        return config;
+        return this.withInheritedSettings(config);
       });
     }
     async setOpenCodeZenApiKey(apiKey) {
       return this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         if (apiKey === null)
           delete config.global.openCodeZenApiKey;
         else
           config.global.openCodeZenApiKey = apiKey;
         await this.saveSensitiveJson(this.configFile(), config);
         this.announce("config", "app");
-        return config;
+        return this.withInheritedSettings(config);
       });
     }
   };
@@ -26771,6 +26904,7 @@ var init_storage_preview_services = __esm(() => {
 // ../../apps/backend/src/core/storage-nodes.ts
 var StorageNodes;
 var init_storage_nodes = __esm(() => {
+  init_controller_settings();
   init_node_store_format();
   init_storage_preview_services();
   StorageNodes = class StorageNodes extends StoragePreviewServices {
@@ -26791,6 +26925,21 @@ var init_storage_nodes = __esm(() => {
     portalLayoutFile() {
       return this.file("portal-layout.json");
     }
+    controllerSettingsFile() {
+      return this.file("controller-settings.json");
+    }
+    async getControllerSettings() {
+      return parseControllerSettingsStore(await this.loadJson(this.controllerSettingsFile(), () => null));
+    }
+    async mutateControllerSettings(mutate) {
+      return this.serializeMutation(this.controllerSettingsFile(), "controller settings", async () => {
+        const current = parseControllerSettingsStore(await this.loadJson(this.controllerSettingsFile(), () => null));
+        const { next, result } = mutate(structuredClone(current));
+        if (next)
+          await this.saveJson(this.controllerSettingsFile(), { ...next, version: 1 });
+        return result;
+      });
+    }
     async getPortalLayout() {
       return parsePortalLayout(await this.loadJson(this.portalLayoutFile(), () => null));
     }
@@ -27195,7 +27344,7 @@ var init_storage_public_operations = __esm(() => {
     }
     async patchRepositorySettingsAtRevision(projectId, expectedRevision, apply) {
       const next = await this.enqueueConfigMutation(async () => {
-        const config = await this.loadConfig();
+        const config = await this.loadOwnConfig();
         const stored = config.repositories[projectId];
         if (expectedRevision !== undefined && repositorySettingsRevision(stored) !== expectedRevision) {
           throw new PublicActionError("revision-conflict", "The project settings changed since they were read; re-read and apply the change again", { details: { currentRevision: repositorySettingsRevision(stored) } });
@@ -108134,10 +108283,16 @@ class TmuxSession {
   forceNextObservation = false;
   observationInFlight;
   inputMutex = new AsyncMutex;
-  constructor(environmentId, tabId, backend, runtimeRootPrefix, resumeSessionId, claudeCommand) {
+  pollTick;
+  now;
+  sleep;
+  constructor(environmentId, tabId, backend, runtimeRootPrefix, resumeSessionId, claudeCommand, timing = {}) {
     this.environmentId = environmentId;
     this.tabId = tabId;
     this.backend = backend;
+    this.pollTick = timing.pollTick ?? ((intervalMs) => delay(intervalMs));
+    this.now = timing.now ?? (() => Date.now());
+    this.sleep = timing.sleep ?? ((delayMs) => delay(delayMs));
     this.resumed = resumeSessionId !== undefined;
     this.firstPromptClaimed = this.resumed;
     this.sessionId = resumeSessionId ?? randomUUID38();
@@ -108397,7 +108552,7 @@ ${help.stderr}`;
   }
   async sendInitialPromptWhenReady(prompt, launchedNew) {
     if (launchedNew)
-      await delay(800);
+      await this.sleep(800);
     await this.waitForTuiInputReady();
     await this.submit(prompt);
     this.setBusyState(true);
@@ -108409,17 +108564,27 @@ ${help.stderr}`;
     this.busyStartedAt = busy ? Date.now() : null;
   }
   async waitForTuiInputReady() {
-    const deadline = Date.now() + 10 * 60 * 1000;
-    while (Date.now() < deadline) {
+    const deadline = this.now() + 10 * 60 * 1000;
+    while (this.now() < deadline) {
       if (!await this.tmuxAlive().catch(() => false)) {
         throw new Error("tmux session stopped before Claude was ready");
       }
-      const snapshot = await this.capturePane().catch(() => "");
+      let snapshot;
+      try {
+        snapshot = await this.capturePane();
+      } catch {
+        await this.sleep(500);
+        continue;
+      }
       if (paneHasClaudeExited(snapshot))
         throw new Error("Claude exited before the initial prompt was sent");
-      if (!paneHasSelectionPrompt(snapshot))
+      if (!paneHasSelectionPrompt(snapshot)) {
+        if (!await this.tmuxAlive().catch(() => false)) {
+          throw new Error("tmux session stopped before Claude was ready");
+        }
         return;
-      await delay(500);
+      }
+      await this.sleep(500);
     }
     throw new Error("timed out waiting for Claude to leave its startup prompt");
   }
@@ -108434,7 +108599,7 @@ ${help.stderr}`;
     (async () => {
       try {
         while (!this.stopRequested) {
-          await delay(POLL_INTERVAL_MS);
+          await this.pollTick(POLL_INTERVAL_MS);
           if (this.stopRequested)
             break;
           tick += 1;
@@ -108887,11 +109052,11 @@ ${help.stderr}`;
     }
   }
   async waitForPaneFastMode(target, initialSnapshot, command) {
-    const deadline = Date.now() + FAST_MODE_SWITCH_TIMEOUT_MS;
-    while (Date.now() < deadline) {
+    const deadline = this.now() + FAST_MODE_SWITCH_TIMEOUT_MS;
+    while (this.now() < deadline) {
       const snapshot = await this.capturePane();
       if (snapshot === initialSnapshot) {
-        await delay(FAST_MODE_POLL_MS);
+        await this.sleep(FAST_MODE_POLL_MS);
         continue;
       }
       if (paneHasClaudeExited(snapshot)) {
@@ -108907,7 +109072,7 @@ ${help.stderr}`;
       const observed = fastModeFromPane(response);
       if (observed === target)
         return;
-      await delay(FAST_MODE_POLL_MS);
+      await this.sleep(FAST_MODE_POLL_MS);
     }
     throw new Error(`Claude did not confirm fast mode ${target ? "on" : "off"}`);
   }
@@ -108944,16 +109109,16 @@ ${help.stderr}`;
     return permissionModeFromPane(snapshot);
   }
   async waitForPanePermissionMode(targetMode) {
-    const deadline = Date.now() + PERMISSION_MODE_SWITCH_TIMEOUT_MS;
+    const deadline = this.now() + PERMISSION_MODE_SWITCH_TIMEOUT_MS;
     let lastObservedMode;
-    while (Date.now() < deadline) {
+    while (this.now() < deadline) {
       const observedMode = await this.capturePanePermissionMode();
       if (observedMode) {
         lastObservedMode = observedMode;
         if (observedMode === targetMode)
           return observedMode;
       }
-      await delay(PERMISSION_MODE_POLL_MS);
+      await this.sleep(PERMISSION_MODE_POLL_MS);
     }
     const observed = lastObservedMode ? `; observed ${lastObservedMode}` : "";
     throw new Error(`Claude did not enter ${targetMode}${observed}`);
@@ -108971,20 +109136,20 @@ ${help.stderr}`;
     });
   }
   async waitForCommandIdle() {
-    const started = Date.now();
+    const started = this.now();
     const deadline = started + COMMAND_IDLE_TIMEOUT_MS;
     const noHookDeadline = started + COMMAND_NO_HOOK_SETTLE_MS;
     let sawBusy = this.busy;
-    while (Date.now() < deadline) {
+    while (this.now() < deadline) {
       if (this.busy) {
         sawBusy = true;
       } else if (sawBusy) {
-        await delay(COMMAND_AFTER_IDLE_SETTLE_MS);
+        await this.sleep(COMMAND_AFTER_IDLE_SETTLE_MS);
         return;
-      } else if (Date.now() >= noHookDeadline) {
+      } else if (this.now() >= noHookDeadline) {
         return;
       }
-      await delay(50);
+      await this.sleep(50);
     }
     console.warn("[tmux] timed out waiting for Claude slash command to settle", this.tmuxSession);
   }
@@ -109255,12 +109420,12 @@ function resolveBundledClaudePath(context) {
 function resolvePinnedClaudeCommand(context, backend) {
   return backend.kind === "container" ? undefined : resolveBundledClaudePath(context);
 }
-async function getOrCreateSession(context, environmentId, tabId, resumeSessionId) {
+async function getOrCreateSession(context, environmentId, tabId, resumeSessionId, timing) {
   const existing = tmuxManager.get(environmentId, tabId);
   if (existing)
     return existing;
   const backend = await resolveBackend(environmentId, context);
-  const session = new TmuxSession(environmentId, tabId, backend, runtimeRootPrefixForContext(context), resumeSessionId, resolvePinnedClaudeCommand(context, backend));
+  const session = new TmuxSession(environmentId, tabId, backend, runtimeRootPrefixForContext(context), resumeSessionId, resolvePinnedClaudeCommand(context, backend), timing);
   tmuxManager.insert(environmentId, tabId, session);
   return session;
 }
@@ -109982,7 +110147,7 @@ function registerTmuxBackendCommands(registerCommand, options2 = {}) {
         else
           await killOrphanSession(context, envId, tab);
       }
-      const session = await getOrCreateSession(context, envId, tab, resumeId);
+      const session = await getOrCreateSession(context, envId, tab, resumeId, options2.sessionTiming);
       if (firstPrompt)
         session.claimFirstPromptForNaming();
       await installWorkspaceHooks(session.backend, session.workspaceHookPaths);
@@ -112637,6 +112802,19 @@ async function main() {
         if (index !== candidate.index && cmd.cwd === "." && !coveredBy.has(index) && !Array.from(coveredBy.values()).includes(index) && candidate.covers.includes(cmd.command) && !dependsOn(candidate.index, index) && cmd.dependsOn.every(id => dependsOn(candidate.index, commands.findIndex(dependency => dependency.id === id)))) coveredBy.set(index, candidate.index);
       }
     }
+    // A repeated identical command (same command line and directory) adds no
+    // evidence, only its cost again. The first copy covers it, unless the copy
+    // waits on setup the first does not, which may make the rerun meaningful.
+    const repeats = new Set();
+    for (const [index, cmd] of commands.entries()) {
+      if (coveredBy.has(index)) continue;
+      const first = commands.findIndex(other => other.command === cmd.command && other.cwd === cmd.cwd);
+      if (first === index) continue;
+      const prerequisites = cmd.dependsOn.map(id => commands.findIndex(dependency => dependency.id === id));
+      if (!prerequisites.every(dependency => dependency === first || dependsOn(first, dependency))) continue;
+      coveredBy.set(index, coveredBy.get(first) ?? first);
+      repeats.add(index);
+    }
     const pending = new Set(commands.map((_, i) => i));
     while ((pending.size || tasks.size) && !stopping) {
       for (const index of Array.from(pending)) {
@@ -112652,7 +112830,7 @@ async function main() {
         if (coveringIndex !== undefined) {
           const covering = run.results[coveringIndex];
           if (["pending", "queued", "running"].includes(covering.status)) continue;
-          Object.assign(run.results[index], { status: covering.status === "passed" ? "skipped" : "incomplete", limitation: covering.status === "passed" ? "Covered by " + covering.id + " (repository-declared coverage)" : "Covering validation " + covering.id + " did not pass" });
+          Object.assign(run.results[index], { status: covering.status === "passed" ? "skipped" : "incomplete", limitation: covering.status === "passed" ? "Covered by " + covering.id + (repeats.has(index) ? " (identical command)" : " (repository-declared coverage)") : "Covering validation " + covering.id + " did not pass" });
           pending.delete(index);
           persist();
           continue;
@@ -113178,11 +113356,13 @@ async function main() {
   let timedOut = false;
   let cancelled = false;
   let killTimer = null;
+  // Tests may only shorten the TERM-to-KILL grace; production uses 5s.
+  const killGraceMs = Math.max(100, Math.min(5000, Number(process.env.ORKESTRATOR_TEST_EXEC_KILL_GRACE_MS) || 5000));
   const terminate = () => {
     if (!pgid) return;
     signalGroup(pgid, "SIGTERM");
     if (!killTimer) {
-      killTimer = setTimeout(() => signalGroup(pgid, "SIGKILL"), 5000);
+      killTimer = setTimeout(() => signalGroup(pgid, "SIGKILL"), killGraceMs);
     }
   };
   const pump = (stream, fd, name) => stream.on("data", (chunk) => {
@@ -129964,6 +130144,7 @@ var NODE_EXCLUDED_COMMANDS = new Set([
   "detach_controller_here",
   "allow_controller",
   "list_controllers",
+  "sync_controller_settings",
   "set_command_node_enabled",
   "create_client_grant",
   "renew_client_grant",
@@ -130481,9 +130662,113 @@ class NodePortal {
   }
 }
 
+// ../../apps/backend/src/core/index.ts
+init_controller_settings();
+
 // ../../apps/backend/src/core/nodes/node-service.ts
 init_command_nodes();
 init_federation();
+init_controller_settings();
+
+// ../../apps/backend/src/core/nodes/node-controller-settings.ts
+init_controller_settings();
+init_federation();
+import { isDeepStrictEqual } from "util";
+
+class LeafControllerSettings {
+  options;
+  store = { version: 1, entries: [] };
+  mutations = Promise.resolve();
+  serialize(run) {
+    const next = this.mutations.then(run);
+    this.mutations = next.catch(() => {
+      return;
+    });
+    return next;
+  }
+  constructor(options2) {
+    this.options = options2;
+  }
+  async start() {
+    this.store = await this.options.storage.getControllerSettings();
+  }
+  async receive(args) {
+    return this.serialize(() => this.receiveSettings(args));
+  }
+  async receiveSettings(args) {
+    const controllerId = args.controllerId;
+    if (!isBackendId(controllerId))
+      throw new Error("Expected controllerId to be a node identity.");
+    if (this.options.attachedName(controllerId) === null) {
+      throw new Error("That command node is not attached to this node.");
+    }
+    const settings = parseInheritedGlobalSettings(args.settings);
+    const before = this.source();
+    const changedAt = new Date(this.options.now()).toISOString();
+    const changed = await this.options.storage.mutateControllerSettings((current) => {
+      const existing = current.entries.find((entry) => entry.controllerId === controllerId);
+      if (existing && isDeepStrictEqual(existing.settings, settings)) {
+        return { next: null, result: { value: current, changed: false } };
+      }
+      const value = {
+        version: 1,
+        entries: [
+          ...current.entries.filter((entry) => entry.controllerId !== controllerId),
+          { controllerId, settings, changedAt }
+        ]
+      };
+      return { next: value, result: { value, changed: true } };
+    });
+    this.store = changed.value;
+    if (changed.changed || !isDeepStrictEqual(before, this.source()))
+      this.options.onChange();
+    return { applied: this.source()?.controllerId === controllerId };
+  }
+  async forget(controllerId) {
+    return this.serialize(() => this.forgetSettings(controllerId));
+  }
+  async forgetSettings(controllerId) {
+    const hadEntry = this.store.entries.some((entry) => entry.controllerId === controllerId);
+    this.store = {
+      ...this.store,
+      entries: this.store.entries.filter((entry) => entry.controllerId !== controllerId)
+    };
+    if (hadEntry)
+      this.options.onChange();
+    const removed = await this.options.storage.mutateControllerSettings((current) => {
+      const entries = current.entries.filter((entry) => entry.controllerId !== controllerId);
+      if (entries.length === current.entries.length) {
+        return { next: null, result: { value: current, removed: false } };
+      }
+      const value = { version: 1, entries };
+      return { next: value, result: { value, removed: true } };
+    });
+    this.store = removed.value;
+  }
+  current() {
+    return this.followed()?.settings ?? null;
+  }
+  source() {
+    const entry = this.followed();
+    if (!entry)
+      return;
+    return {
+      controllerId: entry.controllerId,
+      displayName: this.options.attachedName(entry.controllerId) ?? "",
+      changedAt: entry.changedAt
+    };
+  }
+  followed() {
+    let best = null;
+    for (const entry of this.store.entries) {
+      if (this.options.attachedName(entry.controllerId) === null)
+        continue;
+      if (!best || entry.changedAt >= best.changedAt)
+        best = entry;
+    }
+    return best;
+  }
+}
 
 // ../../apps/backend/src/core/nodes/node-ssh-prompts.ts
 init_command_nodes();
@@ -130562,12 +130847,25 @@ class NodeService {
   changeListeners = new Set;
   detachListeners = new Set;
   changeQueued = false;
+  inheritedSettings;
+  sentSettings = new WeakMap;
+  unsupportedSettings = new WeakMap;
+  settingsSends = new WeakMap;
   constructor(options2) {
     this.options = options2;
     this.storage = options2.storage;
     this.emit = options2.emit;
     this.now = options2.now ?? Date.now;
     this.prompts = new NodeSshPrompts(options2.emit);
+    this.inheritedSettings = new LeafControllerSettings({
+      storage: options2.storage,
+      now: this.now,
+      attachedName: (controllerId) => this.attachments.controllers.find((entry) => entry.controllerId === controllerId)?.displayName ?? null,
+      onChange: () => {
+        this.options.onInheritedSettingsChanged?.();
+        this.emitStatus();
+      }
+    });
   }
   async start() {
     if (this.started)
@@ -130576,6 +130874,7 @@ class NodeService {
     await this.self();
     this.attachments = await this.storage.getNodeAttachments();
     this.registry = await this.storage.getNodeRegistry();
+    await this.inheritedSettings.start();
     this.lastMode = this.mode();
     this.applyMode();
     this.retryDetaches();
@@ -130628,6 +130927,9 @@ class NodeService {
     const recent = this.mostRecentControllerId();
     if (recent)
       status.mostRecentControllerId = recent;
+    const inherited = this.inheritedSettings.source();
+    if (inherited)
+      status.inheritedSettingsFrom = inherited;
     return status;
   }
   mode() {
@@ -130702,6 +131004,9 @@ class NodeService {
     if (registry.nodes.some((node) => node.nodeId === parsed.controllerId)) {
       throw new NodeRefusalError(NODE_REFUSAL_CODES.controllerIsSubordinate, "That command node is registered under this node. Forget it here first; only two levels are allowed.");
     }
+    if (!this.attachments.controllers.some((entry) => entry.controllerId === parsed.controllerId)) {
+      await this.inheritedSettings.forget(parsed.controllerId);
+    }
     const timestamp = new Date(this.now()).toISOString();
     const next = await this.storage.mutateNodeAttachments((current) => {
       if (current.detachedControllers.some((entry) => entry.controllerId === parsed.controllerId)) {
@@ -130765,6 +131070,7 @@ class NodeService {
       this.applyMode();
       this.emitStatus();
     }
+    await this.inheritedSettings.forget(controllerId);
     return { detached: result.detached };
   }
   listControllers() {
@@ -130865,6 +131171,51 @@ class NodeService {
       console.warn("[nodes] Could not record the latest controller contact:", errorCode(error));
     }
   }
+  syncSettingsToLeaves() {
+    for (const link of this.links.values())
+      this.syncSettingsTo(link);
+  }
+  syncSettingsTo(link) {
+    const source = this.options.inheritableSettings;
+    if (!source || !link.connected || this.isLeaf())
+      return;
+    const nodeId = link.nodeId;
+    const previous = this.settingsSends.get(link) ?? Promise.resolve();
+    const next = previous.then(async () => {
+      if (!link.connected || this.links.get(nodeId) !== link)
+        return;
+      const epoch = link.view.epoch;
+      if (this.unsupportedSettings.get(link) === epoch)
+        return;
+      const settings = await source();
+      if (!link.connected || this.links.get(nodeId) !== link || link.view.epoch !== epoch)
+        return;
+      const serialized = JSON.stringify(settings);
+      const sent = this.sentSettings.get(link);
+      if (sent && sent.epoch === epoch && sent.settings === serialized)
+        return;
+      try {
+        await link.invoke(SYNC_CONTROLLER_SETTINGS_COMMAND, {
+          controllerId: this.selfId,
+          settings
+        });
+        this.sentSettings.set(link, { epoch, settings: serialized });
+      } catch (error) {
+        if (error instanceof Error && error.message === `Unknown command: ${SYNC_CONTROLLER_SETTINGS_COMMAND}`) {
+          this.unsupportedSettings.set(link, epoch);
+        }
+        console.warn("[nodes] Could not send settings to a node:", errorCode(error));
+      }
+    });
+    const settled = next.catch(() => {
+      return;
+    });
+    this.settingsSends.set(link, settled);
+    settled.then(() => {
+      if (this.settingsSends.get(link) === settled)
+        this.settingsSends.delete(link);
+    });
+  }
   async listNodes() {
     const registry = await this.currentRegistry();
     return {
@@ -131216,7 +131567,10 @@ class NodeService {
       ssh: this.sshFor(nodeId),
       ...this.options.timers ? { timers: this.options.timers } : {},
       ...this.options.heartbeatMs ? { heartbeatMs: this.options.heartbeatMs } : {},
-      onChange: () => this.publishNodes(),
+      onChange: () => {
+        this.publishNodes();
+        this.syncSettingsTo(link);
+      },
       onVerified: (update) => void this.recordVerified(link.nodeId, update),
       onIdentity: (installationId) => this.adoptIdentity(link.nodeId, installationId)
     });
@@ -158040,6 +158394,7 @@ function registerBackendProfileCommands(register) {
 
 // ../../apps/backend/src/core/commands-registry-nodes.ts
 init_command_nodes();
+init_controller_settings();
 init_federation();
 init_commands_validation();
 init_node_files();
@@ -158098,6 +158453,10 @@ function registerNodeCommands(register) {
     assertOnlyKeys(args, ["controllerId"], "arguments");
     return nodes(context).detachController(args.controllerId, { byUser: true });
   });
+  register(SYNC_CONTROLLER_SETTINGS_COMMAND, async (args, context) => {
+    assertOnlyKeys(args, ["controllerId", "settings"], "arguments");
+    return nodes(context).inheritedSettings.receive(args);
+  });
   register("allow_controller", async (args, context) => {
     assertOnlyKeys(args, ["controllerId"], "arguments");
     return nodes(context).allowController(args.controllerId);
@@ -177662,8 +178021,13 @@ function registerProjectCommands(register, dependencies) {
     const force = args.force === undefined ? false : asRequiredBoolean(args.force, "force");
     return planUsageReader(context, platform, { force });
   });
-  register("update_global_config", async ({ global: global2 }, { storage }) => {
-    const updated = await storage.updateGlobalConfig(stripRendererCredentials(asRecord3(global2, "global")), { preserveCredentials: true });
+  register("update_global_config", async ({ global: global2, preserveInheritedSettings }, { storage }) => {
+    const updated = await storage.updateGlobalConfig(stripRendererCredentials(asRecord3(global2, "global")), {
+      preserveCredentials: true,
+      ...preserveInheritedSettings === undefined ? {} : {
+        preserveInheritedSettings: asRequiredBoolean(preserveInheritedSettings, "preserveInheritedSettings")
+      }
+    });
     configureTerminalHistoryRetention({
       enabled: updated.global.terminalHistoryEnabled,
       sessionMb: updated.global.terminalHistoryRetentionMb,
@@ -228563,9 +228927,12 @@ class OrkestratorBackend {
       ...options2.nodeLinks?.fetchImpl ? { fetchImpl: options2.nodeLinks.fetchImpl } : {},
       ...options2.nodeLinks?.timers ? { timers: options2.nodeLinks.timers } : {},
       ...options2.nodeLinks?.heartbeatMs ? { heartbeatMs: options2.nodeLinks.heartbeatMs } : {},
-      ...options2.nodeLinks?.createSsh ?? createNodeSshFactory(options2.dataDir) ? { createSsh: options2.nodeLinks?.createSsh ?? createNodeSshFactory(options2.dataDir) } : {}
+      ...options2.nodeLinks?.createSsh ?? createNodeSshFactory(options2.dataDir) ? { createSsh: options2.nodeLinks?.createSsh ?? createNodeSshFactory(options2.dataDir) } : {},
+      inheritableSettings: async () => pickInheritedGlobalSettings((await storage.loadConfig()).global),
+      onInheritedSettingsChanged: () => storage.announceInheritedSettingsChanged()
     });
     context.nodes = this.nodes;
+    storage.inheritedGlobalSettings = () => this.nodes.inheritedSettings.current();
     this.nodePortal = new NodePortal({
       nodes: this.nodes,
       emit: (event, payload) => options2.emit(event, payload),
@@ -228865,6 +229232,8 @@ class OrkestratorBackend {
       }
       if (change.resource === "prompt-queue")
         this.activityJobs?.wake("tmux-queues");
+      if (change.resource === "config")
+        this.nodes.syncSettingsToLeaves();
     });
     this.reapPidServers = options2.startupReapers?.localServers ?? reapOrphanedLocalServers;
     this.reapTmuxRuntimes = options2.startupReapers?.claudeTmuxRuntimes ?? reapOrphanedClaudeTmuxRuntimes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orkestrator",
-  "version": "2.26.1-alpha",
+  "version": "2.26.2-beta",
   "description": "Run the Orkestrator backend service without the desktop application",
   "homepage": "https://orkestrator.dev",
   "repository": {
@@ -39,8 +39,8 @@
     "sharp": "0.35.5"
   },
   "devDependencies": {
-    "@orkestrator/protocol": "2.26.1-alpha",
-    "@orkestrator/toolchain": "2.26.1-alpha"
+    "@orkestrator/protocol": "2.26.2-beta",
+    "@orkestrator/toolchain": "2.26.2-beta"
   },
   "engines": {
     "bun": ">=1.4.3"