Skip to content

Commit a00520a

Browse files
fpfp100fpfp100
authored
Merge branch 'main' into users/pefan/enabledefaul
2 parents b8f345b + 778f6d5 commit a00520a

18 files changed

Lines changed: 964 additions & 667 deletions

File tree

‎copyFiles.js‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
3+
4+
import fs from 'fs';
5+
import path from 'path';
6+
import { fileURLToPath } from 'url';
7+
import { dirname } from 'path';
8+
9+
const __filename = fileURLToPath(import.meta.url);
10+
const __dirname = dirname(__filename);
11+
12+
/**
13+
* Copies LICENSE.md and CHANGELOG.md to the specified target directory
14+
* @param {string} targetDir - The directory to copy files to
15+
*/
16+
function copyFiles(targetDir) {
17+
if (!targetDir) {
18+
console.error('Error: Target directory not provided');
19+
console.log('Usage: node copyFiles.js <target-directory>');
20+
process.exit(1);
21+
}
22+
23+
const rootDir = __dirname;
24+
const filesToCopy = ['LICENSE.md', 'CHANGELOG.md'];
25+
26+
// Ensure target directory exists
27+
if (!fs.existsSync(targetDir)) {
28+
fs.mkdirSync(targetDir, { recursive: true });
29+
console.log(`Created directory: ${targetDir}`);
30+
}
31+
32+
// Copy each file
33+
filesToCopy.forEach(file => {
34+
const sourcePath = path.join(rootDir, file);
35+
const destPath = path.resolve(targetDir, file);
36+
37+
if (!fs.existsSync(sourcePath)) {
38+
console.error(`Error: Source file not found: ${sourcePath}`);
39+
process.exit(1);
40+
}
41+
42+
try {
43+
fs.copyFileSync(sourcePath, destPath);
44+
console.log(`Copied ${file}`);
45+
console.log(` From: ${sourcePath}`);
46+
console.log(` To: ${destPath}`);
47+
} catch (error) {
48+
console.error(`Error copying ${file}:`, error.message);
49+
process.exit(1);
50+
}
51+
});
52+
53+
console.log('All files copied successfully!');
54+
}
55+
56+
// Get target directory from command line arguments
57+
const targetDir = process.argv[2];
58+
copyFiles(targetDir);

‎packages/agents-a365-notifications/package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"lint:fix": "eslint src/**/*.ts --fix",
1818
"prepublishOnly": "npm run clean && npm run build",
1919
"ci": "npm ci",
20-
"pack": "cp ../../CHANGELOG.md . && cp ../../LICENSE.md . && npm pack --pack-destination=../"
20+
"pack": "node ../../copyFiles.js . && pnpm pack --pack-destination=../"
2121
},
2222
"keywords": [
2323
"ai",
@@ -34,21 +34,21 @@
3434
},
3535
"dependencies": {
3636
"@microsoft/agents-a365-runtime": "workspace:*",
37-
"@microsoft/agents-activity": "*",
38-
"@microsoft/agents-hosting": "*"
37+
"@microsoft/agents-activity": "catalog:",
38+
"@microsoft/agents-hosting": "catalog:"
3939
},
4040
"devDependencies": {
41-
"@eslint/js": "^9.39.1",
42-
"@types/jest": "workspace:*",
43-
"@types/node": "^20.0.0",
44-
"@typescript-eslint/eslint-plugin": "^8.47.0",
45-
"@typescript-eslint/parser": "^8.47.0",
46-
"eslint": "^9.39.1",
47-
"jest": "workspace:*",
48-
"rimraf": "^5.0.0",
49-
"ts-jest": "workspace:*",
50-
"typescript": "^5.9.3",
51-
"typescript-eslint": "^8.47.0"
41+
"@eslint/js": "catalog:",
42+
"@types/jest": "catalog:",
43+
"@types/node": "catalog:",
44+
"@typescript-eslint/eslint-plugin": "catalog:",
45+
"@typescript-eslint/parser": "catalog:",
46+
"eslint": "catalog:",
47+
"jest": "catalog:",
48+
"rimraf": "catalog:",
49+
"ts-jest": "catalog:",
50+
"typescript": "catalog:",
51+
"typescript-eslint": "catalog:"
5252
},
5353
"engines": {
5454
"node": ">=18.0.0"

‎packages/agents-a365-observability-extensions-openai/package.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,29 +42,29 @@
4242
"test": "jest",
4343
"test:watch": "jest --watch",
4444
"test:coverage": "jest --coverage",
45-
"pack": "cp ../../CHANGELOG.md . && cp ../../LICENSE.md . && npm pack --pack-destination=../"
45+
"pack": "node ../../copyFiles.js . && pnpm pack --pack-destination=../"
4646
},
4747
"dependencies": {
4848
"@microsoft/agents-a365-observability": "workspace:*",
49-
"@openai/agents": "*",
50-
"@opentelemetry/api": "*",
51-
"@opentelemetry/instrumentation": "*"
49+
"@openai/agents": "catalog:",
50+
"@opentelemetry/api": "catalog:",
51+
"@opentelemetry/instrumentation": "catalog:"
5252
},
5353
"devDependencies": {
54-
"@eslint/js": "^9.39.1",
55-
"@types/jest": "^29.5.12",
56-
"@types/node": "^20.0.0",
57-
"@typescript-eslint/eslint-plugin": "^8.47.0",
58-
"@typescript-eslint/parser": "^8.47.0",
59-
"eslint": "^9.39.1",
60-
"jest": "^29.7.0",
61-
"rimraf": "^6.0.0",
62-
"ts-jest": "^29.2.0",
63-
"typescript": "^5.9.3",
64-
"typescript-eslint": "^8.47.0"
54+
"@eslint/js": "catalog:",
55+
"@types/jest": "catalog:",
56+
"@types/node": "catalog:",
57+
"@typescript-eslint/eslint-plugin": "catalog:",
58+
"@typescript-eslint/parser": "catalog:",
59+
"eslint": "catalog:",
60+
"jest": "catalog:",
61+
"rimraf": "catalog:",
62+
"ts-jest": "catalog:",
63+
"typescript": "catalog:",
64+
"typescript-eslint": "catalog:"
6565
},
6666
"peerDependencies": {
67-
"@openai/agents": "^0.1.5"
67+
"@openai/agents": "catalog:"
6868
},
6969
"engines": {
7070
"node": ">=18.0.0"

‎packages/agents-a365-observability-hosting/package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,25 +39,25 @@
3939
"test": "jest --passWithNoTests",
4040
"test:watch": "jest --watch",
4141
"test:coverage": "jest --coverage",
42-
"pack": "npm pack --pack-destination=../"
42+
"pack": "node ../../copyFiles.js . && pnpm pack --pack-destination=../"
4343
},
4444
"dependencies": {
4545
"@microsoft/agents-a365-observability": "workspace:*",
4646
"@microsoft/agents-a365-runtime": "workspace:*",
47-
"@microsoft/agents-hosting": "^1.1.0-alpha.85"
47+
"@microsoft/agents-hosting": "catalog:"
4848
},
4949
"devDependencies": {
50-
"@eslint/js": "^9.39.1",
51-
"@types/jest": "workspace:*",
52-
"@types/node": "^20.0.0",
53-
"@typescript-eslint/eslint-plugin": "^8.47.0",
54-
"@typescript-eslint/parser": "^8.47.0",
55-
"eslint": "^9.39.1",
56-
"jest": "workspace:*",
57-
"rimraf": "^6.0.0",
58-
"ts-jest": "workspace:*",
59-
"typescript": "^5.9.3",
60-
"typescript-eslint": "^8.47.0"
50+
"@eslint/js": "catalog:",
51+
"@types/jest": "catalog:",
52+
"@types/node": "catalog:",
53+
"@typescript-eslint/eslint-plugin": "catalog:",
54+
"@typescript-eslint/parser": "catalog:",
55+
"eslint": "catalog:",
56+
"jest": "catalog:",
57+
"rimraf": "catalog:",
58+
"ts-jest": "catalog:",
59+
"typescript": "catalog:",
60+
"typescript-eslint": "catalog:"
6161
},
6262
"engines": {
6363
"node": ">=18.0.0"

‎packages/agents-a365-observability/package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"lint:fix": "eslint src/**/*.ts --fix",
1818
"prepublishOnly": "npm run clean && npm run build",
1919
"ci": "npm ci",
20-
"pack": "cp ../../CHANGELOG.md . && cp ../../LICENSE.md . && npm pack --pack-destination=../"
20+
"pack": "node ../../copyFiles.js . && pnpm pack --pack-destination=../"
2121
},
2222
"keywords": [
2323
"Agent365",
@@ -37,28 +37,28 @@
3737
"directory": "packages/agents-a365-observability"
3838
},
3939
"dependencies": {
40-
"@azure/monitor-opentelemetry-exporter": "*",
40+
"@azure/monitor-opentelemetry-exporter": "catalog:",
4141
"@microsoft/agents-a365-runtime": "workspace:*",
42-
"@opentelemetry/api": "*",
43-
"@opentelemetry/exporter-trace-otlp-http": "*",
44-
"@opentelemetry/instrumentation": "*",
45-
"@opentelemetry/resources": "*",
46-
"@opentelemetry/sdk-node": "*",
47-
"@opentelemetry/sdk-trace-base": "*",
48-
"@opentelemetry/semantic-conventions": "*"
42+
"@opentelemetry/api": "catalog:",
43+
"@opentelemetry/exporter-trace-otlp-http": "catalog:",
44+
"@opentelemetry/instrumentation": "catalog:",
45+
"@opentelemetry/resources": "catalog:",
46+
"@opentelemetry/sdk-node": "catalog:",
47+
"@opentelemetry/sdk-trace-base": "catalog:",
48+
"@opentelemetry/semantic-conventions": "catalog:"
4949
},
5050
"devDependencies": {
51-
"@eslint/js": "^9.39.1",
52-
"@types/jest": "workspace:*",
53-
"@types/node": "^20.0.0",
54-
"@typescript-eslint/eslint-plugin": "^8.47.0",
55-
"@typescript-eslint/parser": "^8.47.0",
56-
"eslint": "^9.39.1",
57-
"jest": "workspace:*",
58-
"rimraf": "^5.0.0",
59-
"ts-jest": "workspace:*",
60-
"typescript": "^5.9.3",
61-
"typescript-eslint": "^8.47.0"
51+
"@eslint/js": "catalog:",
52+
"@types/jest": "catalog:",
53+
"@types/node": "catalog:",
54+
"@typescript-eslint/eslint-plugin": "catalog:",
55+
"@typescript-eslint/parser": "catalog:",
56+
"eslint": "catalog:",
57+
"jest": "catalog:",
58+
"rimraf": "catalog:",
59+
"ts-jest": "catalog:",
60+
"typescript": "catalog:",
61+
"typescript-eslint": "catalog:"
6262
},
6363
"engines": {
6464
"node": ">=18.0.0"

‎packages/agents-a365-runtime/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# This file is generated by a prebuild script.
2+
src/version.ts

‎packages/agents-a365-runtime/package.json‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"module": "dist/esm/index.js",
77
"types": "dist/esm/index.d.ts",
88
"scripts": {
9+
"prebuild": "node -p \"'export const LIB_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" > src/version.ts",
910
"build:cjs": "npx tsc --project tsconfig.cjs.json",
1011
"build:esm": "npx tsc --project tsconfig.esm.json",
1112
"build": "npm run build:cjs && npm run build:esm",
@@ -17,7 +18,7 @@
1718
"lint:fix": "eslint src/**/*.ts --fix",
1819
"prepublishOnly": "npm run clean && npm run build",
1920
"ci": "npm ci",
20-
"pack": "cp ../../CHANGELOG.md . && cp ../../LICENSE.md . && npm pack --pack-destination=../"
21+
"pack": "node ../../copyFiles.js . && pnpm pack --pack-destination=../"
2122
},
2223
"keywords": [
2324
"ai",
@@ -33,23 +34,23 @@
3334
"directory": "packages/agents-a365-runtime"
3435
},
3536
"dependencies": {
36-
"@azure/identity": "^4.12.1",
37-
"@microsoft/agents-hosting": "*",
38-
"jsonwebtoken": "^9.0.2"
37+
"@azure/identity": "catalog:",
38+
"@microsoft/agents-hosting": "catalog:",
39+
"jsonwebtoken": "catalog:"
3940
},
4041
"devDependencies": {
41-
"@eslint/js": "^9.39.1",
42-
"@types/jest": "workspace:*",
43-
"@types/jsonwebtoken": "^9.0.10",
44-
"@types/node": "^20.0.0",
45-
"@typescript-eslint/eslint-plugin": "^8.47.0",
46-
"@typescript-eslint/parser": "^8.47.0",
47-
"eslint": "^9.39.1",
48-
"jest": "workspace:*",
49-
"rimraf": "^5.0.0",
50-
"ts-jest": "workspace:*",
51-
"typescript": "^5.9.3",
52-
"typescript-eslint": "^8.47.0"
42+
"@eslint/js": "catalog:",
43+
"@types/jest": "catalog:",
44+
"@types/jsonwebtoken": "catalog:",
45+
"@types/node": "catalog:",
46+
"@typescript-eslint/eslint-plugin": "catalog:",
47+
"@typescript-eslint/parser": "catalog:",
48+
"eslint": "catalog:",
49+
"jest": "catalog:",
50+
"rimraf": "catalog:",
51+
"ts-jest": "catalog:",
52+
"typescript": "catalog:",
53+
"typescript-eslint": "catalog:"
5354
},
5455
"engines": {
5556
"node": ">=18.0.0"

‎packages/agents-a365-runtime/src/utility.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33

44
import { TurnContext } from '@microsoft/agents-hosting';
55
import * as jwt from 'jsonwebtoken';
6+
import os from 'os';
7+
8+
import { LIB_VERSION } from './version';
69

710
/**
811
* Utility class providing helper methods for agent runtime operations.
@@ -47,4 +50,15 @@ export class Utility {
4750

4851
return agenticAppId;
4952
}
53+
54+
/**
55+
* Generates a User-Agent header string containing SDK version, OS type, Node.js version, and orchestrator.
56+
* @param orchestrator Optional orchestrator identifier to include in the User-Agent string.
57+
* @returns Formatted User-Agent header string.
58+
*/
59+
public static GetUserAgentHeader(orchestrator: string = ''): string {
60+
const osType = os.type();
61+
const orchestratorPart = orchestrator ? `; ${orchestrator}` : '';
62+
return `Agent365SDK/${LIB_VERSION} (${osType}; Node.js ${process.version}${orchestratorPart})`;
63+
}
5064
}

‎packages/agents-a365-tooling-extensions-claude/package.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"lint:fix": "eslint src/**/*.ts --fix",
1818
"prepublishOnly": "npm run clean && npm run build",
1919
"ci": "npm ci",
20-
"pack": "cp ../../CHANGELOG.md . && cp ../../LICENSE.md . && npm pack --pack-destination=../"
20+
"pack": "node ../../copyFiles.js . && pnpm pack --pack-destination=../"
2121
},
2222
"keywords": [
2323
"ai",
@@ -34,24 +34,24 @@
3434
"directory": "packages/agents-a365-tooling-extensions-claude"
3535
},
3636
"dependencies": {
37-
"@anthropic-ai/claude-agent-sdk": "*",
37+
"@anthropic-ai/claude-agent-sdk": "catalog:",
3838
"@microsoft/agents-a365-runtime": "workspace:*",
3939
"@microsoft/agents-a365-tooling": "workspace:*",
40-
"@microsoft/agents-hosting": "*",
41-
"@modelcontextprotocol/sdk": "workspace:*"
40+
"@microsoft/agents-hosting": "catalog:",
41+
"@modelcontextprotocol/sdk": "catalog:"
4242
},
4343
"devDependencies": {
44-
"@eslint/js": "^9.39.1",
45-
"@types/jest": "workspace:*",
46-
"@types/node": "^20.0.0",
47-
"@typescript-eslint/eslint-plugin": "^8.47.0",
48-
"@typescript-eslint/parser": "^8.47.0",
49-
"eslint": "^9.39.1",
50-
"jest": "workspace:*",
51-
"rimraf": "^5.0.0",
52-
"ts-jest": "workspace:*",
53-
"typescript": "^5.9.3",
54-
"typescript-eslint": "^8.47.0"
44+
"@eslint/js": "catalog:",
45+
"@types/jest": "catalog:",
46+
"@types/node": "catalog:",
47+
"@typescript-eslint/eslint-plugin": "catalog:",
48+
"@typescript-eslint/parser": "catalog:",
49+
"eslint": "catalog:",
50+
"jest": "catalog:",
51+
"rimraf": "catalog:",
52+
"ts-jest": "catalog:",
53+
"typescript": "catalog:",
54+
"typescript-eslint": "catalog:"
5555
},
5656
"engines": {
5757
"node": ">=18.0.0"

0 commit comments

Comments
 (0)