Skip to content

Commit fc3ef22

Browse files
authored
Merge pull request elizaOS#3645 from elizaOS/odi-fix-lock
chore: stablize develop
2 parents a003d14 + e531d32 commit fc3ef22

9 files changed

Lines changed: 1690 additions & 1876 deletions

File tree

.github/workflows/integrationTests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
1515
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
1616
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
17-
TURBO_REMOTE_ONLY: true
17+
TURBO_CACHE: remote:rw
1818
steps:
1919
- uses: actions/checkout@v4
2020
with:
@@ -43,4 +43,4 @@ jobs:
4343
fi
4444
4545
- name: Run integration tests
46-
run: pnpm run integrationTests
46+
run: pnpm run integrationTests

.github/workflows/smoke-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
1515
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
1616
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
17-
TURBO_REMOTE_ONLY: true
17+
TURBO_CACHE: remote:rw
1818
steps:
1919
- uses: actions/checkout@v4
2020
with:

client/src/lib/info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version": "0.25.7"}
1+
{"version": "0.25.8"}

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"husky": "9.1.7",
3636
"jest": "^29.7.0",
3737
"lerna": "8.1.5",
38+
"nodemon": "3.1.7",
3839
"only-allow": "1.2.1",
3940
"turbo": "2.4.2",
4041
"typedoc": "0.26.11",

packages/client-direct/src/api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function validateUUIDParams(
5252
}
5353

5454
export function createApiRouter(
55-
agents: Map<string, AgentRuntime>,
55+
agents: Map<string, IAgentRuntime>,
5656
directClient: DirectClient
5757
):Router {
5858
const router = express.Router();

packages/client-direct/src/index.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -656,12 +656,16 @@ export class DirectClient {
656656
"/fine-tune/:assetId",
657657
async (req: express.Request, res: express.Response) => {
658658
const assetId = req.params.assetId;
659-
const downloadDir = path.join(
660-
process.cwd(),
661-
"downloads",
662-
assetId
663-
);
664659

660+
const ROOT_DIR = path.join(process.cwd(), "downloads");
661+
const downloadDir = path.resolve(ROOT_DIR, assetId);
662+
663+
if (!downloadDir.startsWith(ROOT_DIR)) {
664+
res.status(403).json({
665+
error: "Invalid assetId. Access denied.",
666+
});
667+
return;
668+
}
665669
elizaLogger.log("Download directory:", downloadDir);
666670

667671
try {

packages/client-direct/src/verifiable-log-api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type {
1010
} from "@elizaos/plugin-tee-verifiable-log";
1111

1212
export function createVerifiableLogApiRouter(
13-
agents: Map<string, AgentRuntime>
13+
agents: Map<string, IAgentRuntime>
1414
):Router {
1515
const router = express.Router();
1616
router.use(cors());

pnpm-lock.yaml

Lines changed: 1673 additions & 1860 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

turbo.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616
},
1717
"@elizaos/client-direct#build": {
1818
"outputs": ["dist/**"],
19-
"dependsOn": [
20-
"@elizaos/plugin-image-generation#build",
21-
"@elizaos/plugin-tee-log#build",
22-
"@elizaos/plugin-tee-verifiable-log#build"
23-
]
19+
"dependsOn": []
2420
},
2521
"eliza-docs#build": {
2622
"outputs": ["build/**"]

0 commit comments

Comments
 (0)