Skip to content

Commit 004bab5

Browse files
authored
fix(ci): repair protocol drift and audit failures (openclaw#63917)
* CI: fix protocol drift and audit failures * CI: narrow axios release-age exception * CI: drop ineffective feishu override * test: fix workspace-root guard mock typing
1 parent 1e15bb2 commit 004bab5

6 files changed

Lines changed: 35 additions & 13 deletions

File tree

apps/macos/Sources/OpenClawProtocol/GatewayModels.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2837,19 +2837,22 @@ public struct ModelChoice: Codable, Sendable {
28372837
public let id: String
28382838
public let name: String
28392839
public let provider: String
2840+
public let alias: String?
28402841
public let contextwindow: Int?
28412842
public let reasoning: Bool?
28422843

28432844
public init(
28442845
id: String,
28452846
name: String,
28462847
provider: String,
2848+
alias: String?,
28472849
contextwindow: Int?,
28482850
reasoning: Bool?)
28492851
{
28502852
self.id = id
28512853
self.name = name
28522854
self.provider = provider
2855+
self.alias = alias
28532856
self.contextwindow = contextwindow
28542857
self.reasoning = reasoning
28552858
}
@@ -2858,6 +2861,7 @@ public struct ModelChoice: Codable, Sendable {
28582861
case id
28592862
case name
28602863
case provider
2864+
case alias
28612865
case contextwindow = "contextWindow"
28622866
case reasoning
28632867
}

apps/shared/OpenClawKit/Sources/OpenClawProtocol/GatewayModels.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2837,19 +2837,22 @@ public struct ModelChoice: Codable, Sendable {
28372837
public let id: String
28382838
public let name: String
28392839
public let provider: String
2840+
public let alias: String?
28402841
public let contextwindow: Int?
28412842
public let reasoning: Bool?
28422843

28432844
public init(
28442845
id: String,
28452846
name: String,
28462847
provider: String,
2848+
alias: String?,
28472849
contextwindow: Int?,
28482850
reasoning: Bool?)
28492851
{
28502852
self.id = id
28512853
self.name = name
28522854
self.provider = provider
2855+
self.alias = alias
28532856
self.contextwindow = contextwindow
28542857
self.reasoning = reasoning
28552858
}
@@ -2858,6 +2861,7 @@ public struct ModelChoice: Codable, Sendable {
28582861
case id
28592862
case name
28602863
case provider
2864+
case alias
28612865
case contextwindow = "contextWindow"
28622866
case reasoning
28632867
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1431,7 +1431,7 @@
14311431
"@anthropic-ai/sdk": "0.81.0",
14321432
"hono": "4.12.12",
14331433
"@hono/node-server": "1.19.13",
1434-
"axios": "1.13.6",
1434+
"axios": "1.15.0",
14351435
"defu": "6.1.5",
14361436
"fast-xml-parser": "5.5.7",
14371437
"request": "npm:@cypress/request@3.0.10",

pnpm-lock.yaml

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

pnpm-workspace.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ minimumReleaseAgeExclude:
1919
- "@typescript/native-preview*"
2020
- "@oxlint/*"
2121
- "@oxfmt/*"
22+
- "axios@1.15.0"
2223
- "sqlite-vec"
2324
- "sqlite-vec-*"
2425

src/agents/pi-tools.read.workspace-root-guard.test.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ import path from "node:path";
22
import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
33
import type { AnyAgentTool } from "./pi-tools.types.js";
44

5+
type AssertSandboxPath = typeof import("./sandbox-paths.js").assertSandboxPath;
6+
57
const mocks = vi.hoisted(() => ({
6-
assertSandboxPath: vi.fn(async () => ({ resolved: "/tmp/root", relative: "" })),
8+
assertSandboxPath: vi.fn<AssertSandboxPath>(async () => ({
9+
resolved: "/tmp/root",
10+
relative: "",
11+
})),
712
}));
813

914
vi.mock("./sandbox-paths.js", () => ({
@@ -31,11 +36,19 @@ let wrapToolWorkspaceRootGuardWithOptions: typeof import("./pi-tools.read.js").w
3136

3237
describe("wrapToolWorkspaceRootGuardWithOptions", () => {
3338
const root = "/tmp/root";
39+
const assertSandboxPathImpl: AssertSandboxPath = async ({ filePath }) => ({
40+
resolved:
41+
filePath.startsWith("file://") || path.isAbsolute(filePath)
42+
? filePath
43+
: path.resolve(root, filePath),
44+
relative: "",
45+
});
3446

3547
beforeAll(loadModule);
3648

3749
beforeEach(() => {
38-
mocks.assertSandboxPath.mockClear();
50+
mocks.assertSandboxPath.mockReset();
51+
mocks.assertSandboxPath.mockImplementation(assertSandboxPathImpl);
3952
});
4053

4154
it("maps container workspace paths to host workspace root", async () => {

0 commit comments

Comments
 (0)