Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ts/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20 AS base
FROM node:22 AS base

ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
Expand Down
2 changes: 1 addition & 1 deletion ts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The main entry point to explore TypeAgent is the [TypeAgent Shell](./packages/sh

To build:

- Install [Node 20+](https://nodejs.org/en/download)
- Install [Node 22+](https://nodejs.org/en/download)
- NOTE: HPC Tools conflict with node so be sure that the node.exe you are running is the correct one!
- Install pnpm (`npm i -g pnpm && pnpm setup`)
- **(Linux/WSL Only)** Read TypeAgent Shell's [README.md](./packages/shell/README.md) for additional requirements
Expand Down
3 changes: 1 addition & 2 deletions ts/docs/overview/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ Node and pnpm.

## Prerequisites

- **Node ≥ 22** (the documented minimum; some tooling notes mention Node 20+,
but the monorepo targets Node 22+).
- **Node ≥ 22** (the monorepo targets Node 22+).
- **pnpm ≥ 10** (`npm i -g pnpm && pnpm setup`).
- On Linux/WSL, see the [WSL2](./setup-wsl2.md) / [Linux](./setup-linux.md)
guides for extra system requirements.
Expand Down
70 changes: 1 addition & 69 deletions ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
"shell:start:package": "pnpm -C packages/shell run start:package",
"shell:test": "pnpm -C packages/shell run shell:test",
"start:agent-server": "pnpm -C packages/agentServer/server run start",
"start:agent-server:dev": "pnpm -C packages/agentServer/server run start:dev",
"start:agent-server:tunnel": "pnpm -C packages/agentServer/server run start:tunnel",
"start:mcp": "pnpm -C packages/commandExecutor run start",
"stop:agent-server": "pnpm -C packages/agentServer/server run stop",
Expand All @@ -95,76 +94,9 @@
"tsx": "^4.21.0",
"typescript-eslint": "^8.62.1"
},
"packageManager": "pnpm@10.34.4+sha512.8768be55200ae3f2226b6527fcca2687e14bc4e5f12d7721a0f25da3df47915177058648db4177baf348120fa0ba2752d8d8d93f6beaf1fe64ae18da8de961af",
"packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
"engines": {
"node": ">=22",
"pnpm": ">=10"
},
"pnpm": {
"peerDependencyRules": {
"allowedVersions": {
"@azure/core-rest-pipeline": "*",
"jest": "*",
"zod": "*"
},
"ignoreMissing": [
"eslint",
"zod"
]
},
"onlyBuiltDependencies": [
"@azure/msal-node-extensions",
"@azure/msal-node-runtime",
"@vscode/vsce-sign",
"better-sqlite3",
"canvas",
"electron",
"electron-winstaller",
"esbuild",
"exifreader",
"keytar",
"koffi",
"node-pty",
"onnxruntime-node",
"protobufjs",
"puppeteer",
"sharp"
],
"allowedDeprecatedVersions": {
"@cliqz/adblocker": "*",
"@cliqz/adblocker-content": "*",
"@cliqz/adblocker-extended-selectors": "*",
"@cliqz/adblocker-puppeteer": "*",
"@xmldom/xmldom": "<0.9.9",
"abab": "*",
"boolean": "*",
"crx": "5",
"domexception": "*",
"glob": "<12",
"inflight": "*",
"lodash.isequal": "*",
"node-domexception": "*",
"prebuild-install": "*",
"rimraf": "<4",
"whatwg-encoding": "*"
},
"supportedArchitectures": {
"cpu": [
"x64",
"arm64"
]
},
"overrides": {
"@azure/core-xml": ">=1.5.0 <2.0.0",
"express>path-to-regexp": "0.1.13",
"fast-xml-parser": ">=5.5.7 <6.0.0",
"hono": ">=4.12.8 <5.0.0",
"http-proxy-agent": ">=7.0.0 <8.0.0",
"node-forge": ">=1.4.0 <2.0.0",
"node-gyp": "^12.2.0",
"router>path-to-regexp": ">=8.4.0 <9.0.0",
"serialize-javascript": ">=7.0.5 <8.0.0"
},
"ignoredBuiltDependencies": []
}
}
2 changes: 1 addition & 1 deletion ts/packages/security/mcpValidation/ADOPTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ For running `python -c`, arbitrary scripts, or untrusted code:
{
"container": {
"enabled": true,
"image": "node:20-slim",
"image": "node:22-slim",
"networkMode": "none",
"readOnly": true,
"memoryLimit": "512m"
Expand Down
2 changes: 1 addition & 1 deletion ts/packages/security/mcpValidation/GETTING-STARTED.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ For `python -c`, arbitrary scripts, or untrusted code:
{
"container": {
"enabled": true,
"image": "node:20-slim",
"image": "node:22-slim",
"networkMode": "none",
"deriveVolumesFromPolicy": true,
"readOnly": true,
Expand Down
2 changes: 1 addition & 1 deletion ts/packages/security/mcpValidation/example-policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
},
"container": {
"enabled": false,
"image": "node:20-slim",
"image": "node:22-slim",
"networkMode": "none",
"readOnly": true,
"memoryLimit": "512m",
Expand Down
2 changes: 1 addition & 1 deletion ts/packages/security/mcpValidation/policies/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
},
"container": {
"enabled": false,
"image": "node:20-slim",
"image": "node:22-slim",
"networkMode": "none",
"readOnly": true,
"memoryLimit": "512m",
Expand Down
2 changes: 1 addition & 1 deletion ts/packages/security/mcpValidation/policies/dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
},
"container": {
"enabled": false,
"image": "node:20-slim",
"image": "node:22-slim",
"networkMode": "bridge",
"deriveVolumesFromPolicy": true,
"derivePortsFromPolicy": true,
Expand Down
10 changes: 5 additions & 5 deletions ts/packages/security/mcpValidation/src/mcpValidationTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2010,7 +2010,7 @@ async function testCapabilityTools(): Promise<boolean> {
name: "test-container",
container: {
enabled: true,
image: "node:20-slim",
image: "node:22-slim",
networkMode: "none",
readOnly: true,
memoryLimit: "512m",
Expand All @@ -2026,8 +2026,8 @@ async function testCapabilityTools(): Promise<boolean> {
"expected none network",
);
assert(
state.policy?.container?.image === "node:20-slim",
"expected node:20-slim image",
state.policy?.container?.image === "node:22-slim",
"expected node:22-slim image",
);
});

Expand Down Expand Up @@ -2201,7 +2201,7 @@ async function testContainerSandbox(): Promise<boolean> {

const baseContainerPolicy: ContainerPolicy = {
enabled: true,
image: "node:20-slim",
image: "node:22-slim",
networkMode: "none",
};

Expand All @@ -2214,7 +2214,7 @@ async function testContainerSandbox(): Promise<boolean> {
assert(args.includes("run"), "should include 'run'");
assert(args.includes("--rm"), "should include '--rm'");
assert(args.includes("--network=none"), "should include network=none");
assert(args.includes("node:20-slim"), "should include image name");
assert(args.includes("node:22-slim"), "should include image name");
assert(args.includes("echo hello"), "should include command");
});

Expand Down
2 changes: 1 addition & 1 deletion ts/packages/security/validation/src/orgPolicy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export interface ContainerPolicy {
/** Enable container sandbox for bash execution */
enabled: boolean;

/** Docker image to use (e.g., "node:20-slim", "python:3.12-slim") */
/** Docker image to use (e.g., "node:22-slim", "python:3.12-slim") */
image: string;

/** Container network mode */
Expand Down
4 changes: 2 additions & 2 deletions ts/packages/shell/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"build:electron:cjs": "electron-vite build src/preload --config electron.vite.preload-cjs.config.mts --logLevel error",
"build:electron:esm": "electron-vite build",
"clean": "rimraf --glob out dist deploy *.tsbuildinfo *.done.build.log",
"deploy": "rimraf ./deploy && pnpm deploy --filter=agent-shell --prod ./deploy --ignore-scripts && pnpm -C deploy run postinstall ",
"deploy:app": "rimraf ./deploy && pnpm --filter=agent-shell deploy --prod ./deploy --ignore-scripts && pnpm -C deploy run postinstall ",
"dev": "npm run prepare-vite && cross-env NODE_OPTIONS=--disable-warning=DEP0190 electron-vite dev --",
"dev:noenv": "npm run prepare-vite && electron-vite dev",
"postinstall": "run-script-os",
"jest-esm": "node --no-warnings --experimental-vm-modules ./node_modules/jest/bin/jest.js",
"package": "run-script-os",
"package:default": "pnpm run deploy && electron-builder --projectDir deploy --config ../electron-builder.config.js -p never ",
"package:default": "pnpm run deploy:app && electron-builder --projectDir deploy --config ../electron-builder.config.js -p never ",
"package:linux": "ELECTRON_BUILDER_ARCH=x64 pnpm run package:default --linux --x64",
"package:macos": "pnpm run package:macos:x64 && pnpm run package:macos:arm64",
"package:macos:arm64": "ELECTRON_BUILDER_ARCH=arm64 pnpm run package:default --mac --arm64",
Expand Down
Loading
Loading