Manage multiple Agentlet devices and device-scoped Profiles

apps/server/src/app.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { existsSync, unlinkSync } from 'node:fs';
+import { unlinkSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 
@@ -25,13 +25,10 @@ import {
   externalAgentRuntimeConfigRoutes,
   getExternalAgentRuntimeConfig,
   getAgentProfileRegistry,
-  getSupervisedAgentletId,
   installAcpProfileCachePort,
   mountAgenetes,
   resolveDaemonEntry,
 } from './modules/agent/acp/index.js';
-import { buildLegacyCommandProfiles } from './modules/agent/acp/legacy-profile-migration.js';
-import { listProfiles as listLegacyAcpProfiles } from './modules/agent/acp/profile-store.js';
 import { initializeAgentDefaults } from './modules/agent/agent-defaults.js';
 import agentDefaultsRoutes from './modules/agent/agent-defaults.route.js';
 import agentRoutes from './modules/agent/agent.route.js';
@@ -317,15 +314,7 @@ const agentletGateway = mountAgenetes(app, {
   profiles: {
     storageDir: join(getDataDir(), 'agent-profiles'),
     legacyStorageDir: join(getDataDir(), 'agent-team'),
-    legacyCommandProfiles: existsSync(
-      join(getDataDir(), 'agent-profiles', 'registry.json'),
-    )
-      ? []
-      : buildLegacyCommandProfiles(
-          listLegacyAcpProfiles(),
-          getSupervisedAgentletId(),
-          process.cwd(),
-        ),
+    legacyCommandProfiles: [],
   },
 });
 let unregisterHarnessDiscovery: (() => void) | undefined;

apps/server/src/modules/agent/acp/agent-cli.route.test.ts

@@ -12,8 +12,10 @@ import type { FastifyInstance } from 'fastify';
 const mocks = vi.hoisted(() => ({ getProfile: vi.fn(), discover: vi.fn() }));
 vi.mock('@agenetes/agentlet-host', () => ({
   getAgentProfileRegistry: () => ({ getProfile: mocks.getProfile }),
-  getSupervisedAgentletId: () => 'supervised',
-  getAgentletGateway: () => ({ discoverHarnesses: mocks.discover }),
+  getAgentletGateway: () => ({
+    getAgentlet: () => ({ status: 'connected' }),
+    discoverHarnesses: mocks.discover,
+  }),
 }));
 
 let app: FastifyInstance | undefined;
@@ -52,7 +54,7 @@ describe('ACP agent CLI route', () => {
 
     const response = await app.inject({
       method: 'GET',
-      url: '/api/acp/agent-cli',
+      url: '/api/acp/agent-cli?agentletId=machine-a',
     });
 
     expect(response.statusCode).toBe(200);
@@ -72,7 +74,7 @@ describe('ACP agent CLI route', () => {
 
     const response = await app.inject({
       method: 'GET',
-      url: '/api/acp/agent-cli',
+      url: '/api/acp/agent-cli?agentletId=machine-a',
       remoteAddress: '192.0.2.10',
     });
 
@@ -92,7 +94,7 @@ describe('ACP agent CLI route', () => {
 
     const response = await app.inject({
       method: 'GET',
-      url: '/api/acp/agent-cli',
+      url: '/api/acp/agent-cli?agentletId=machine-a',
       remoteAddress: '192.0.2.10',
     });
 
@@ -108,7 +110,9 @@ describe('ACP agent CLI route', () => {
       ),
       { prefix: '/api/acp' },
     );
-    const response = await app.inject('/api/acp/agent-cli');
+    const response = await app.inject(
+      '/api/acp/agent-cli?agentletId=machine-a',
+    );
     expect(response.statusCode).toBe(503);
     expect(response.json().code).toBe('harness_discovery_unavailable');
     expect(response.json()).not.toHaveProperty('agents');

apps/server/src/modules/agent/acp/agent-cli.route.ts

@@ -17,7 +17,6 @@
 
 import {
   getAgentletGateway,
-  getSupervisedAgentletId,
   getAgentProfileRegistry,
 } from '@agenetes/agentlet-host';
 import {
@@ -36,19 +35,25 @@ import type {
 } from '@huabu/shared';
 import type { FastifyPluginAsync } from 'fastify';
 
-async function detectAgentClis(profileId?: string): Promise<AcpAgentCliInfo[]> {
+async function detectAgentClis(target: {
+  profileId?: string;
+  agentletId?: string;
+}): Promise<AcpAgentCliInfo[]> {
   const gateway = getAgentletGateway();
   if (!gateway) throw new Error('Agentlet Gateway is not ready');
-  const profile = profileId
-    ? getAgentProfileRegistry()?.getProfile(profileId)
+  const profile = target.profileId
+    ? getAgentProfileRegistry()?.getProfile(target.profileId)
     : undefined;
-  if (profileId && !profile) throw new Error('Agent Profile is unavailable');
-  const result = await gateway.discoverHarnesses(
-    profile?.agentletId ?? getSupervisedAgentletId(),
-    {
-      prepareWorkspaces: false,
-    },
-  );
+  if (target.profileId && !profile)
+    throw new Error('Agent Profile is unavailable');
+  const agentletId = profile?.agentletId ?? target.agentletId;
+  if (!agentletId) throw new Error('Agentlet target is required');
+  const connection = gateway.getAgentlet(agentletId);
+  if (connection?.status !== 'connected')
+    throw new Error('Agentlet is not connected');
+  const result = await gateway.discoverHarnesses(agentletId, {
+    prepareWorkspaces: false,
+  });
   if (result.harnesses.some((entry) => entry.id === CUSTOM_COMMAND_WRAPPER_ID))
     return result.harnesses;
   return [
@@ -96,7 +101,7 @@ export function createAcpAgentCliRoutes(
               message: 'Agent Profile is unavailable',
             });
           }
-          return { agents: await detect(parsed.data.profileId) };
+          return { agents: await detect(parsed.data) };
         } catch (error) {
           request.log.warn(
             { err: error },

apps/server/src/modules/agent/acp/daemon-auth.test.ts

@@ -32,7 +32,7 @@ function makeAgentletHello(): AgentletHelloParams {
     agentletId: 'test:agentlet',
     agentletProfile: {
       bridge: { name: 'agentlet', version: '1.0.0' },
-      machine: { hostname: 'test', platform: 'linux' },
+      machine: { hostname: 'test', platform: 'linux', arch: 'x64' },
       capabilities: { autoRestart: true, bufferLimit: 1000 },
     },
   };

apps/server/src/modules/agent/acp/index.ts

@@ -4,7 +4,6 @@
 export {
   mountAgenetes,
   getAgentProfileRegistry,
-  getSupervisedAgentletId,
   ACP_UPGRADE_PATH,
 } from '@agenetes/agentlet-host';
 export type {