@openscout/scout 0.2.39 → 0.2.40

package/dist/scout-web-server.mjs

@@ -1233,7 +1233,7 @@ function diagnoseAgentIdentity(identity, candidates) {
   }
   return { kind: "ambiguous", candidates: matches };
 }
-var DIMENSION_ALIASES, normalizeAgentSelectorSegment, SCOUT_DISPATCHER_AGENT_ID = "scout", RESERVED_AGENT_DEFINITION_IDS, parseAgentSelector, formatAgentSelector, extractAgentSelectors, resolveAgentSelector;
+var DIMENSION_ALIASES, normalizeAgentSelectorSegment, SCOUT_DISPATCHER_AGENT_ID = "scout", BUILT_IN_AGENT_DEFINITION_IDS, RESERVED_AGENT_DEFINITION_IDS, parseAgentSelector, formatAgentSelector, extractAgentSelectors, resolveAgentSelector;
 var init_agent_identity = __esm(() => {
   DIMENSION_ALIASES = {
     workspace: "workspace",
@@ -1247,6 +1247,12 @@ var init_agent_identity = __esm(() => {
     host: "node"
   };
   normalizeAgentSelectorSegment = normalizeAgentIdentitySegment;
+  BUILT_IN_AGENT_DEFINITION_IDS = new Set([
+    SCOUT_DISPATCHER_AGENT_ID,
+    "builder",
+    "reviewer",
+    "research"
+  ]);
   RESERVED_AGENT_DEFINITION_IDS = new Set([
     SCOUT_DISPATCHER_AGENT_ID
   ]);
@@ -2989,7 +2995,7 @@ async function readRelayAgentOverrides() {
   return Object.fromEntries(Object.entries(agents).map(([agentId, record]) => {
     const definitionId = normalizeAgentId(record.definitionId || record.agentId || agentId);
     const projectRoot = normalizePath(record.projectRoot);
-    const concreteAgentId = BUILT_IN_AGENT_IDS.has(definitionId) ? definitionId : buildRelayAgentInstance(definitionId, projectRoot).id;
+    const concreteAgentId = buildRelayAgentInstance(definitionId, projectRoot).id;
     const defaultHarness = normalizeManagedHarness(typeof record.defaultHarness === "string" ? record.defaultHarness : record.runtime?.harness, "claude");
     const harnessProfiles = buildHarnessProfiles({
       projectRoot,
@@ -3024,7 +3030,7 @@ async function writeRelayAgentOverrides(overrides) {
   const normalizedAgents = Object.fromEntries(Object.entries(overrides).map(([agentId, record]) => {
     const definitionId = normalizeAgentId(record.definitionId || record.agentId || agentId);
     const projectRoot = normalizePath(record.projectRoot);
-    const concreteAgentId = BUILT_IN_AGENT_IDS.has(definitionId) ? definitionId : buildRelayAgentInstance(definitionId, projectRoot).id;
+    const concreteAgentId = buildRelayAgentInstance(definitionId, projectRoot).id;
     const defaultHarness = normalizeManagedHarness(typeof record.defaultHarness === "string" ? record.defaultHarness : record.runtime?.harness, "claude");
     const harnessProfiles = buildHarnessProfiles({
       projectRoot,
@@ -3602,14 +3608,14 @@ async function loadResolvedRelayAgents(options = {}) {
     const manifest = await readProjectConfig(projectRoot);
     const override = overrideByRoot.get(projectRoot);
     const resolvedAgent = manifest ? await resolveManifestBackedAgent(projectRoot, manifest, settings, override) : await resolveInferredAgent(projectRoot, settings, override);
-    if (!resolvedAgent.agentId || BUILT_IN_AGENT_IDS.has(resolvedAgent.agentId)) {
+    if (!resolvedAgent.agentId || BUILT_IN_AGENT_DEFINITION_IDS.has(resolvedAgent.definitionId)) {
       continue;
     }
     resolvedAgents.push(resolvedAgent);
   }
   const dedupedResolvedAgents = await dedupeResolvedAgentsByCanonicalProjectRoot(resolvedAgents);
   const configuredAgents = dedupedResolvedAgents.filter((agent) => agent.registrationKind === "configured");
-  const builtInOverrides = Object.fromEntries(Object.entries(overrides).filter(([agentId]) => BUILT_IN_AGENT_IDS.has(agentId)));
+  const builtInOverrides = Object.fromEntries(Object.entries(overrides).filter(([, record]) => record.definitionId ? BUILT_IN_AGENT_DEFINITION_IDS.has(record.definitionId) : false));
   const nextOverrides = {
     ...builtInOverrides,
     ...Object.fromEntries(configuredAgents.map((agent) => [
@@ -3701,11 +3707,12 @@ async function ensureRelayAgentConfigured(value, options = {}) {
 async function ensureScoutRelayAgentConfigured(options = {}) {
   const settings = await readOpenScoutSettings({ currentDirectory: options.currentDirectory });
   const overrides = await readRelayAgentOverrides();
-  const existing = overrides[SCOUT_AGENT_ID];
   const resolvedProjectRoot = options.projectRoot ? normalizePath(options.projectRoot) : options.currentDirectory ? await findNearestProjectRoot(options.currentDirectory) ?? normalizePath(options.currentDirectory) : normalizePath(process.cwd());
+  const qualifiedAgentId = buildRelayAgentInstance(SCOUT_AGENT_ID, resolvedProjectRoot).id;
+  const existing = overrides[qualifiedAgentId] ?? overrides[SCOUT_AGENT_ID];
   const nextOverride = {
     ...existing,
-    agentId: SCOUT_AGENT_ID,
+    agentId: qualifiedAgentId,
     definitionId: SCOUT_AGENT_ID,
     displayName: "Scout",
     projectName: "OpenScout",
@@ -3718,7 +3725,7 @@ async function ensureScoutRelayAgentConfigured(options = {}) {
     defaultHarness: "claude",
     harnessProfiles: buildHarnessProfiles({
       projectRoot: resolvedProjectRoot,
-      sessionKey: SCOUT_AGENT_ID,
+      sessionKey: qualifiedAgentId,
       sessionPrefix: settings.agents.sessionPrefix,
       defaultHarness: "claude",
       profiles: existing?.harnessProfiles,
@@ -3734,13 +3741,16 @@ async function ensureScoutRelayAgentConfigured(options = {}) {
     }
   };
   nextOverride.launchArgs = nextOverride.harnessProfiles?.claude?.launchArgs ?? [];
-  if (JSON.stringify(existing) !== JSON.stringify(nextOverride)) {
-    overrides[SCOUT_AGENT_ID] = nextOverride;
+  if (overrides[SCOUT_AGENT_ID]) {
+    delete overrides[SCOUT_AGENT_ID];
+  }
+  if (JSON.stringify(overrides[qualifiedAgentId]) !== JSON.stringify(nextOverride)) {
+    overrides[qualifiedAgentId] = nextOverride;
     await writeRelayAgentOverrides(overrides);
   }
   return nextOverride;
 }
-var SCOUT_AGENT_ID = "scout", SCOUT_PRIMARY_CONVERSATION_ID = "dm.scout.primary", MANAGED_AGENT_HARNESSES, DEFAULT_OPERATOR_NAME, DEFAULT_CAPABILITIES, DEFAULT_TRANSPORT = "claude_stream_json", DEFAULT_TELEGRAM_MODE = "polling", LEGACY_DEFAULT_TELEGRAM_CONVERSATION_ID = "channel.shared", DEFAULT_TELEGRAM_CONVERSATION_ID, SETTINGS_VERSION = 1, PROJECT_CONFIG_VERSION = 1, BUILT_IN_AGENT_IDS, PROJECT_SCAN_SKIP_DIRECTORIES, PROJECT_STRONG_MARKERS, PROJECT_WEAK_MARKERS, PROJECT_HARNESS_MARKERS, PROJECT_STRONG_MARKERS_FLAT_NESTED, PROJECT_WEAK_MARKERS_FLAT_NESTED, GIT_BRANCH_CACHE_TTL_MS = 15000, gitBranchCache, SCOUT_SKILL_FILE_NAME = "SKILL.md", SETUP_MODULE_DIRECTORY, SCOUT_SKILL_REPO_ROOT, SCOUT_SKILL_INSTALL_PATHS, PROJECT_SCAN_MAX_DEPTH = 64;
+var SCOUT_AGENT_ID = "scout", SCOUT_PRIMARY_CONVERSATION_ID = "dm.scout.primary", MANAGED_AGENT_HARNESSES, DEFAULT_OPERATOR_NAME, DEFAULT_CAPABILITIES, DEFAULT_TRANSPORT = "claude_stream_json", DEFAULT_TELEGRAM_MODE = "polling", LEGACY_DEFAULT_TELEGRAM_CONVERSATION_ID = "channel.shared", DEFAULT_TELEGRAM_CONVERSATION_ID, SETTINGS_VERSION = 1, PROJECT_CONFIG_VERSION = 1, PROJECT_SCAN_SKIP_DIRECTORIES, PROJECT_STRONG_MARKERS, PROJECT_WEAK_MARKERS, PROJECT_HARNESS_MARKERS, PROJECT_STRONG_MARKERS_FLAT_NESTED, PROJECT_WEAK_MARKERS_FLAT_NESTED, GIT_BRANCH_CACHE_TTL_MS = 15000, gitBranchCache, SCOUT_SKILL_FILE_NAME = "SKILL.md", SETUP_MODULE_DIRECTORY, SCOUT_SKILL_REPO_ROOT, SCOUT_SKILL_INSTALL_PATHS, PROJECT_SCAN_MAX_DEPTH = 64;
 var init_setup = __esm(() => {
   init_dist();
   init_src();
@@ -3751,7 +3761,6 @@ var init_setup = __esm(() => {
   DEFAULT_OPERATOR_NAME = guessedOperatorName();
   DEFAULT_CAPABILITIES = ["chat", "invoke", "deliver"];
   DEFAULT_TELEGRAM_CONVERSATION_ID = SCOUT_PRIMARY_CONVERSATION_ID;
-  BUILT_IN_AGENT_IDS = new Set(["scout", "builder", "reviewer", "research"]);
   PROJECT_SCAN_SKIP_DIRECTORIES = new Set([
     ".git",
     ".hg",
@@ -6243,7 +6252,7 @@ async function startLocalAgent(input) {
   const findMatchForRoot = (root) => {
     let fallback = null;
     for (const [id, override] of Object.entries(overrides)) {
-      if (BUILT_IN_LOCAL_AGENT_IDS.has(id))
+      if (BUILT_IN_AGENT_DEFINITION_IDS.has(id))
         continue;
       if (!override.projectRoot)
         continue;
@@ -6483,7 +6492,7 @@ async function loadRegisteredLocalAgentBindings(nodeId, options = {}) {
   return results;
 }
 async function inferLocalAgentBinding(agentId, nodeId) {
-  if (!agentId || BUILT_IN_LOCAL_AGENT_IDS.has(agentId)) {
+  if (!agentId || BUILT_IN_AGENT_DEFINITION_IDS.has(agentId)) {
     return null;
   }
   const overrides = await readRelayAgentOverrides();
@@ -6506,7 +6515,7 @@ async function ensureLocalAgentBindingOnline(agentId, nodeId, options = {}) {
   if (registeredBinding) {
     return registeredBinding;
   }
-  if (BUILT_IN_LOCAL_AGENT_IDS.has(agentId)) {
+  if (BUILT_IN_AGENT_DEFINITION_IDS.has(agentId)) {
     return null;
   }
   if (options.includeDiscovered) {
@@ -6529,7 +6538,7 @@ async function ensureLocalAgentBindingOnline(agentId, nodeId, options = {}) {
   const onlineRecord = await ensureLocalAgentOnline(agentId, recordForHarness(localAgentRecordFromRelayAgentOverride(agentId, override), options.harness));
   return buildLocalAgentBinding(agentId, onlineRecord, isLocalAgentRecordOnline(agentId, onlineRecord), nodeId, "relay-agent-registry");
 }
-var BUILT_IN_LOCAL_AGENT_IDS, MODULE_DIRECTORY, OPENSCOUT_REPO_ROOT, DEFAULT_LOCAL_AGENT_CAPABILITIES, DEFAULT_LOCAL_AGENT_HARNESS = "claude", SUPPORTED_LOCAL_AGENT_HARNESSES;
+var MODULE_DIRECTORY, OPENSCOUT_REPO_ROOT, DEFAULT_LOCAL_AGENT_CAPABILITIES, DEFAULT_LOCAL_AGENT_HARNESS = "claude", SUPPORTED_LOCAL_AGENT_HARNESSES;
 var init_local_agents = __esm(async () => {
   init_src();
   init_claude_stream_json();
@@ -6538,7 +6547,6 @@ var init_local_agents = __esm(async () => {
   init_support_paths();
   init_local_agent_template();
   await init_broker_service();
-  BUILT_IN_LOCAL_AGENT_IDS = new Set(["scout", "builder", "reviewer", "research"]);
   MODULE_DIRECTORY = dirname6(fileURLToPath5(import.meta.url));
   OPENSCOUT_REPO_ROOT = resolve4(MODULE_DIRECTORY, "..", "..", "..");
   DEFAULT_LOCAL_AGENT_CAPABILITIES = ["chat", "invoke", "deliver"];
@@ -8131,6 +8139,7 @@ function resolveScoutSurfaceCapabilities(surface) {
 }
 
 // apps/desktop/src/app/desktop/shell.ts
+init_src();
 init_setup();
 import { readFile as readFile6, readdir as readdir3, stat as stat4 } from "fs/promises";
 import { performance } from "perf_hooks";
@@ -8342,7 +8351,6 @@ var BROKER_SHARED_CHANNEL_ID = "channel.shared";
 var OPERATOR_ID = "operator";
 var DEFAULT_BROKER_HOST2 = "127.0.0.1";
 var DEFAULT_BROKER_PORT2 = 65535;
-var BUILT_IN_SCOUT_AGENT_IDS = new Set([SCOUT_AGENT_ID, "builder", "reviewer", "research"]);
 function buildScoutBrokerUrlFromEnv() {
   const host = process.env.OPENSCOUT_BROKER_HOST ?? DEFAULT_BROKER_HOST2;
   const port = Number.parseInt(process.env.OPENSCOUT_BROKER_PORT ?? String(DEFAULT_BROKER_PORT2), 10);
@@ -9019,7 +9027,6 @@ function readProjectGitActivity(projectRoot) {
 
 // apps/desktop/src/app/desktop/shell.ts
 var OPERATOR_ID2 = "operator";
-var BUILT_IN_ROLE_AGENT_IDS = new Set(["scout", "builder", "reviewer", "research"]);
 var RECENT_AGENT_ACTIVITY_WINDOW_SECONDS = 60 * 60 * 24 * 30;
 var RECONCILE_OFFLINE_WAIT_SECONDS = 60 * 3;
 var RECONCILE_NO_FOLLOW_UP_SECONDS = 60 * 10;
@@ -9230,7 +9237,7 @@ function interAgentThreadKey(participantIds) {
 function visibleRelayAgentIds(snapshot, configuredAgentIds, messagesByConversation, directActivity) {
   const visible = new Set([
     ...configuredAgentIds,
-    ...Array.from(BUILT_IN_ROLE_AGENT_IDS)
+    ...Array.from(BUILT_IN_AGENT_DEFINITION_IDS)
   ]);
   const cutoff = Math.floor(Date.now() / 1000) - RECENT_AGENT_ACTIVITY_WINDOW_SECONDS;
   for (const [agentId, activity] of directActivity.entries()) {
@@ -11279,7 +11286,6 @@ var SCOUT_BROKER_OPERATOR_ID = "operator";
 var SCOUT_SHARED_CHANNEL_ID = "channel.shared";
 var SCOUT_VOICE_CHANNEL_ID = "channel.voice";
 var SCOUT_SYSTEM_CHANNEL_ID = "channel.system";
-var SCOUT_AGENT_ID2 = "scout";
 function resolveCurrentDirectory(input) {
   return input?.trim() || process.cwd();
 }
@@ -11515,14 +11521,14 @@ async function ensureDirectConversation(baseUrl, snapshot, nodeId, agentId, oper
   const definition = {
     id: conversationId,
     kind: "direct",
-    title: agentId === SCOUT_AGENT_ID2 ? "Scout" : actorDisplayName2(snapshot, agentId, operatorName),
+    title: agentId === SCOUT_AGENT_ID ? "Scout" : actorDisplayName2(snapshot, agentId, operatorName),
     visibility: "private",
     shareMode: nextShareMode,
     authorityNodeId: nodeId,
     participantIds: [SCOUT_BROKER_OPERATOR_ID, agentId].sort(),
     metadata: {
       surface: "scout-desktop",
-      ...agentId === SCOUT_AGENT_ID2 ? { role: "partner" } : {}
+      ...agentId === SCOUT_AGENT_ID ? { role: "partner" } : {}
     }
   };
   await postBrokerJson(baseUrl, "/v1/conversations", definition);
@@ -11729,7 +11735,7 @@ async function sendScoutDesktopRelayMessage(input, options = {}) {
   await ensureCoreConversation(broker.baseUrl, broker.snapshot, broker.node.id, SCOUT_SYSTEM_CHANNEL_ID);
   const directTarget = input.destinationKind === "direct" ? input.destinationId : null;
   if (directTarget) {
-    if (directTarget === SCOUT_AGENT_ID2) {
+    if (directTarget === SCOUT_AGENT_ID) {
       await ensureScoutRelayAgentConfigured({ currentDirectory });
     }
     await ensureBrokerAgentBinding(broker.baseUrl, broker.snapshot, broker.node.id, directTarget, currentDirectory);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openscout/scout",
-  "version": "0.2.39",
+  "version": "0.2.40",
   "description": "Published Scout package that installs the `scout` command",
   "license": "UNLICENSED",
   "type": "module",
@@ -23,6 +23,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@openscout/runtime": "0.2.39"
+    "@openscout/runtime": "0.2.40"
   }
 }