* feat(secrets): expand secret target coverage and gateway tooling * docs(secrets): align gateway and CLI secret docs * chore(protocol): regenerate swift gateway models for secrets methods * fix(config): restore talk apiKey fallback and stabilize runner test * ci(windows): reduce test worker count for shard stability * ci(windows): raise node heap for test shard stability * test(feishu): make proxy env precedence assertion windows-safe * fix(gateway): resolve auth password SecretInput refs for clients * fix(gateway): resolve remote SecretInput credentials for clients * fix(secrets): skip inactive refs in command snapshot assignments * fix(secrets): scope gateway.remote refs to effective auth surfaces * fix(secrets): ignore memory defaults when enabled agents disable search * fix(secrets): honor Google Chat serviceAccountRef inheritance * fix(secrets): address tsgo errors in command and gateway collectors * fix(secrets): avoid auth-store load in providers-only configure * fix(gateway): defer local password ref resolution by precedence * fix(secrets): gate telegram webhook secret refs by webhook mode * fix(secrets): gate slack signing secret refs to http mode * fix(secrets): skip telegram botToken refs when tokenFile is set * fix(secrets): gate discord pluralkit refs by enabled flag * fix(secrets): gate discord voice tts refs by voice enabled * test(secrets): make runtime fixture modes explicit * fix(cli): resolve local qr password secret refs * fix(cli): fail when gateway leaves command refs unresolved * fix(gateway): fail when local password SecretRef is unresolved * fix(gateway): fail when required remote SecretRefs are unresolved * fix(gateway): resolve local password refs only when password can win * fix(cli): skip local password SecretRef resolution on qr token override * test(gateway): cast SecretRef fixtures to OpenClawConfig * test(secrets): activate mode-gated targets in runtime coverage fixture * fix(cron): support SecretInput webhook tokens safely * fix(bluebubbles): support SecretInput passwords across config paths * fix(msteams): make appPassword SecretInput-safe in onboarding/token paths * fix(bluebubbles): align SecretInput schema helper typing * fix(cli): clarify secrets.resolve version-skew errors * refactor(secrets): return structured inactive paths from secrets.resolve * refactor(gateway): type onboarding secret writes as SecretInput * chore(protocol): regenerate swift models for secrets.resolve * feat(secrets): expand extension credential secretref support * fix(secrets): gate web-search refs by active provider * fix(onboarding): detect SecretRef credentials in extension status * fix(onboarding): allow keeping existing ref in secret prompt * fix(onboarding): resolve gateway password SecretRefs for probe and tui * fix(onboarding): honor secret-input-mode for local gateway auth * fix(acp): resolve gateway SecretInput credentials * fix(secrets): gate gateway.remote refs to remote surfaces * test(secrets): cover pattern matching and inactive array refs * docs(secrets): clarify secrets.resolve and remote active surfaces * fix(bluebubbles): keep existing SecretRef during onboarding * fix(tests): resolve CI type errors in new SecretRef coverage * fix(extensions): replace raw fetch with SSRF-guarded fetch * test(secrets): mark gateway remote targets active in runtime coverage * test(infra): normalize home-prefix expectation across platforms * fix(cli): only resolve local qr password refs in password mode * test(cli): cover local qr token mode with unresolved password ref * docs(cli): clarify local qr password ref resolution behavior * refactor(extensions): reuse sdk SecretInput helpers * fix(wizard): resolve onboarding env-template secrets before plaintext * fix(cli): surface secrets.resolve diagnostics in memory and qr * test(secrets): repair post-rebase runtime and fixtures * fix(gateway): skip remote password ref resolution when token wins * fix(secrets): treat tailscale remote gateway refs as active * fix(gateway): allow remote password fallback when token ref is unresolved * fix(gateway): ignore stale local password refs for none and trusted-proxy * fix(gateway): skip remote secret ref resolution on local call paths * test(cli): cover qr remote tailscale secret ref resolution * fix(secrets): align gateway password active-surface with auth inference * fix(cli): resolve inferred local gateway password refs in qr * fix(gateway): prefer resolvable remote password over token ref pre-resolution * test(gateway): cover none and trusted-proxy stale password refs * docs(secrets): sync qr and gateway active-surface behavior * fix: restore stability blockers from pre-release audit * Secrets: fix collector/runtime precedence contradictions * docs: align secrets and web credential docs * fix(rebase): resolve integration regressions after main rebase * fix(node-host): resolve gateway secret refs for auth * fix(secrets): harden secretinput runtime readers * gateway: skip inactive auth secretref resolution * cli: avoid gateway preflight for inactive secret refs * extensions: allow unresolved refs in onboarding status * tests: fix qr-cli module mock hoist ordering * Security: align audit checks with SecretInput resolution * Gateway: resolve local-mode remote fallback secret refs * Node host: avoid resolving inactive password secret refs * Secrets runtime: mark Slack appToken inactive for HTTP mode * secrets: keep inactive gateway remote refs non-blocking * cli: include agent memory secret targets in runtime resolution * docs(secrets): sync docs with active-surface and web search behavior * fix(secrets): keep telegram top-level token refs active for blank account tokens * fix(daemon): resolve gateway password secret refs for probe auth * fix(secrets): skip IRC NickServ ref resolution when NickServ is disabled * fix(secrets): align token inheritance and exec timeout defaults * docs(secrets): clarify active-surface notes in cli docs * cli: require secrets.resolve gateway capability * gateway: log auth secret surface diagnostics * secrets: remove dead provider resolver module * fix(secrets): restore gateway auth precedence and fallback resolution * fix(tests): align plugin runtime mock typings --------- Co-authored-by: Peter Steinberger <steipete@gmail.com>
292 lines
8.8 KiB
TypeScript
292 lines
8.8 KiB
TypeScript
import fs from "node:fs/promises";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import "./test-helpers/fast-coding-tools.js";
|
|
import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
|
|
import type { OpenClawConfig } from "../config/config.js";
|
|
|
|
function createMockUsage(input: number, output: number) {
|
|
return {
|
|
input,
|
|
output,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
totalTokens: input + output,
|
|
cost: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
total: 0,
|
|
},
|
|
};
|
|
}
|
|
|
|
vi.mock("@mariozechner/pi-coding-agent", async () => {
|
|
return await vi.importActual<typeof import("@mariozechner/pi-coding-agent")>(
|
|
"@mariozechner/pi-coding-agent",
|
|
);
|
|
});
|
|
|
|
vi.mock("@mariozechner/pi-ai", async () => {
|
|
const actual = await vi.importActual<typeof import("@mariozechner/pi-ai")>("@mariozechner/pi-ai");
|
|
|
|
const buildAssistantMessage = (model: { api: string; provider: string; id: string }) => ({
|
|
role: "assistant" as const,
|
|
content: [{ type: "text" as const, text: "ok" }],
|
|
stopReason: "stop" as const,
|
|
api: model.api,
|
|
provider: model.provider,
|
|
model: model.id,
|
|
usage: createMockUsage(1, 1),
|
|
timestamp: Date.now(),
|
|
});
|
|
|
|
const buildAssistantErrorMessage = (model: { api: string; provider: string; id: string }) => ({
|
|
role: "assistant" as const,
|
|
content: [],
|
|
stopReason: "error" as const,
|
|
errorMessage: "boom",
|
|
api: model.api,
|
|
provider: model.provider,
|
|
model: model.id,
|
|
usage: createMockUsage(0, 0),
|
|
timestamp: Date.now(),
|
|
});
|
|
|
|
return {
|
|
...actual,
|
|
complete: async (model: { api: string; provider: string; id: string }) => {
|
|
if (model.id === "mock-error") {
|
|
return buildAssistantErrorMessage(model);
|
|
}
|
|
return buildAssistantMessage(model);
|
|
},
|
|
completeSimple: async (model: { api: string; provider: string; id: string }) => {
|
|
if (model.id === "mock-error") {
|
|
return buildAssistantErrorMessage(model);
|
|
}
|
|
return buildAssistantMessage(model);
|
|
},
|
|
streamSimple: (model: { api: string; provider: string; id: string }) => {
|
|
const stream = actual.createAssistantMessageEventStream();
|
|
queueMicrotask(() => {
|
|
stream.push({
|
|
type: "done",
|
|
reason: "stop",
|
|
message:
|
|
model.id === "mock-error"
|
|
? buildAssistantErrorMessage(model)
|
|
: buildAssistantMessage(model),
|
|
});
|
|
stream.end();
|
|
});
|
|
return stream;
|
|
},
|
|
};
|
|
});
|
|
|
|
let runEmbeddedPiAgent: typeof import("./pi-embedded-runner/run.js").runEmbeddedPiAgent;
|
|
let SessionManager: typeof import("@mariozechner/pi-coding-agent").SessionManager;
|
|
let tempRoot: string | undefined;
|
|
let agentDir: string;
|
|
let workspaceDir: string;
|
|
let sessionCounter = 0;
|
|
let runCounter = 0;
|
|
|
|
beforeAll(async () => {
|
|
vi.useRealTimers();
|
|
({ runEmbeddedPiAgent } = await import("./pi-embedded-runner/run.js"));
|
|
({ SessionManager } = await import("@mariozechner/pi-coding-agent"));
|
|
tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-embedded-agent-"));
|
|
agentDir = path.join(tempRoot, "agent");
|
|
workspaceDir = path.join(tempRoot, "workspace");
|
|
await fs.mkdir(agentDir, { recursive: true });
|
|
await fs.mkdir(workspaceDir, { recursive: true });
|
|
}, 180_000);
|
|
|
|
afterAll(async () => {
|
|
if (!tempRoot) {
|
|
return;
|
|
}
|
|
await fs.rm(tempRoot, { recursive: true, force: true });
|
|
tempRoot = undefined;
|
|
});
|
|
|
|
const makeOpenAiConfig = (modelIds: string[]) =>
|
|
({
|
|
models: {
|
|
providers: {
|
|
openai: {
|
|
api: "openai-responses",
|
|
apiKey: "sk-test",
|
|
baseUrl: "https://example.com",
|
|
models: modelIds.map((id) => ({
|
|
id,
|
|
name: `Mock ${id}`,
|
|
reasoning: false,
|
|
input: ["text"],
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
contextWindow: 16_000,
|
|
maxTokens: 2048,
|
|
})),
|
|
},
|
|
},
|
|
},
|
|
}) satisfies OpenClawConfig;
|
|
|
|
const nextSessionFile = () => {
|
|
sessionCounter += 1;
|
|
return path.join(workspaceDir, `session-${sessionCounter}.jsonl`);
|
|
};
|
|
const nextRunId = (prefix = "run-embedded-test") => `${prefix}-${++runCounter}`;
|
|
const nextSessionKey = () => `agent:test:embedded:${nextRunId("session-key")}`;
|
|
const immediateEnqueue = async <T>(task: () => Promise<T>) => task();
|
|
|
|
const runWithOrphanedSingleUserMessage = async (text: string, sessionKey: string) => {
|
|
const sessionFile = nextSessionFile();
|
|
const sessionManager = SessionManager.open(sessionFile);
|
|
sessionManager.appendMessage({
|
|
role: "user",
|
|
content: [{ type: "text", text }],
|
|
timestamp: Date.now(),
|
|
});
|
|
|
|
const cfg = makeOpenAiConfig(["mock-1"]);
|
|
return await runEmbeddedPiAgent({
|
|
sessionId: "session:test",
|
|
sessionKey,
|
|
sessionFile,
|
|
workspaceDir,
|
|
config: cfg,
|
|
prompt: "hello",
|
|
provider: "openai",
|
|
model: "mock-1",
|
|
timeoutMs: 5_000,
|
|
agentDir,
|
|
runId: nextRunId("orphaned-user"),
|
|
enqueue: immediateEnqueue,
|
|
});
|
|
};
|
|
|
|
const textFromContent = (content: unknown) => {
|
|
if (typeof content === "string") {
|
|
return content;
|
|
}
|
|
if (Array.isArray(content) && content[0]?.type === "text") {
|
|
return (content[0] as { text?: string }).text;
|
|
}
|
|
return undefined;
|
|
};
|
|
|
|
const readSessionEntries = async (sessionFile: string) => {
|
|
const raw = await fs.readFile(sessionFile, "utf-8");
|
|
return raw
|
|
.split(/\r?\n/)
|
|
.filter(Boolean)
|
|
.map((line) => JSON.parse(line) as { type?: string; customType?: string; data?: unknown });
|
|
};
|
|
|
|
const readSessionMessages = async (sessionFile: string) => {
|
|
const entries = await readSessionEntries(sessionFile);
|
|
return entries
|
|
.filter((entry) => entry.type === "message")
|
|
.map(
|
|
(entry) => (entry as { message?: { role?: string; content?: unknown } }).message,
|
|
) as Array<{ role?: string; content?: unknown }>;
|
|
};
|
|
|
|
const runDefaultEmbeddedTurn = async (sessionFile: string, prompt: string, sessionKey: string) => {
|
|
const cfg = makeOpenAiConfig(["mock-error"]);
|
|
await runEmbeddedPiAgent({
|
|
sessionId: "session:test",
|
|
sessionKey,
|
|
sessionFile,
|
|
workspaceDir,
|
|
config: cfg,
|
|
prompt,
|
|
provider: "openai",
|
|
model: "mock-error",
|
|
timeoutMs: 5_000,
|
|
agentDir,
|
|
runId: nextRunId("default-turn"),
|
|
enqueue: immediateEnqueue,
|
|
});
|
|
};
|
|
|
|
describe("runEmbeddedPiAgent", () => {
|
|
it("handles prompt error paths without dropping user state", async () => {
|
|
const sessionFile = nextSessionFile();
|
|
const cfg = makeOpenAiConfig(["mock-error"]);
|
|
const sessionKey = nextSessionKey();
|
|
const result = await runEmbeddedPiAgent({
|
|
sessionId: "session:test",
|
|
sessionKey,
|
|
sessionFile,
|
|
workspaceDir,
|
|
config: cfg,
|
|
prompt: "boom",
|
|
provider: "openai",
|
|
model: "mock-error",
|
|
timeoutMs: 5_000,
|
|
agentDir,
|
|
runId: nextRunId("prompt-error"),
|
|
enqueue: immediateEnqueue,
|
|
});
|
|
expect(result.payloads?.[0]?.isError).toBe(true);
|
|
|
|
const messages = await readSessionMessages(sessionFile);
|
|
const userIndex = messages.findIndex(
|
|
(message) => message?.role === "user" && textFromContent(message.content) === "boom",
|
|
);
|
|
expect(userIndex).toBeGreaterThanOrEqual(0);
|
|
});
|
|
|
|
it(
|
|
"preserves existing transcript entries across an additional turn",
|
|
{ timeout: 7_000 },
|
|
async () => {
|
|
const sessionFile = nextSessionFile();
|
|
const sessionKey = nextSessionKey();
|
|
|
|
const sessionManager = SessionManager.open(sessionFile);
|
|
sessionManager.appendMessage({
|
|
role: "user",
|
|
content: [{ type: "text", text: "seed user" }],
|
|
timestamp: Date.now(),
|
|
});
|
|
sessionManager.appendMessage({
|
|
role: "assistant",
|
|
content: [{ type: "text", text: "seed assistant" }],
|
|
stopReason: "stop",
|
|
api: "openai-responses",
|
|
provider: "openai",
|
|
model: "mock-1",
|
|
usage: createMockUsage(1, 1),
|
|
timestamp: Date.now(),
|
|
});
|
|
|
|
await runDefaultEmbeddedTurn(sessionFile, "hello", sessionKey);
|
|
|
|
const messages = await readSessionMessages(sessionFile);
|
|
const seedUserIndex = messages.findIndex(
|
|
(message) => message?.role === "user" && textFromContent(message.content) === "seed user",
|
|
);
|
|
const seedAssistantIndex = messages.findIndex(
|
|
(message) =>
|
|
message?.role === "assistant" && textFromContent(message.content) === "seed assistant",
|
|
);
|
|
expect(seedUserIndex).toBeGreaterThanOrEqual(0);
|
|
expect(seedAssistantIndex).toBeGreaterThan(seedUserIndex);
|
|
expect(messages.length).toBeGreaterThanOrEqual(2);
|
|
},
|
|
);
|
|
|
|
it("repairs orphaned user messages and continues", async () => {
|
|
const result = await runWithOrphanedSingleUserMessage("orphaned user", nextSessionKey());
|
|
|
|
expect(result.meta.error).toBeUndefined();
|
|
expect(result.payloads?.length ?? 0).toBeGreaterThan(0);
|
|
});
|
|
});
|