mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-06 22:12:53 +00:00
* refactor: extract agent core package Introduce packages/agent-core as the OpenClaw-owned home for reusable agent loop, harness, session, prompt, and runtime dependency contracts. * refactor: extract shared llm runtime Move provider model registries, stream wrappers, OAuth helpers, and LLM utilities into src/llm with plugin-sdk barrels instead of depending on the old embedded runtime layout. * refactor: remove pi runtime internals Rename remaining Pi-shaped agent surfaces to OpenClaw agent runtime names, delete obsolete Pi docs and package graph checks, and add the third-party notice for incorporated code. * refactor: tighten agent session runtime Make agent-core/runtime dependencies explicit, consolidate compaction and session transcript helpers, and move model/session helpers behind OpenClaw-owned contracts. * refactor: remove static model and pi auth paths Drop static model catalogs and Pi auth bridges, move model/provider facts to manifest-owned runtime contracts, and harden internal embedded-agent utilities. * refactor: remove legacy provider compat paths * docs: remove agent parity notes * fix: skip provider wildcard metadata parsing * refactor: share session extension sdk loading * refactor: inline acpx proxy error formatter * refactor: fold edit recovery into edit tool * fix: accept extension batch separator * test: align startup provider plugin expectations * fix: restore provider-scoped release discovery * test: align static asset packaging expectations * fix: run static provider catalogs during scoped discovery * fix: add provider entry catalogs for scoped live discovery * fix: load lightweight provider catalog entries * fix: refresh provider-scoped plugin metadata * fix: keep provider catalog entries on release live path * fix: keep static manifest models in release live checks * fix: harden release model discovery * fix: reduce OpenAI live cache probe reasoning * fix: disable OpenAI cache probe reasoning * ci: extend OpenAI gateway live timeout * fix: extend live gateway model budget * fix: stabilize release validation regressions * fix: honor provider aliases in model rows * fix: stabilize release validation lanes * fix: stabilize release memory qa * ci: stabilize release validation lanes * ci: prefer ipv4 for live docker node calls * fix: restore shared tool-call stream wrapper * ci: remove legacy pi test shard alias * fix: clean up embedded agent test drift * fix: stabilize runtime alias status * fix: clean up embedded agent ci drift * fix: restore release ci invariants * fix: clean up post-rebase runtime drift * fix: restore release ci checks * fix: restore release ci after rebase * fix: remove stale pi runtime path * test: align compaction runtime expectations * test: update plugin prerelease expectations * fix: handle claude live tool approvals * fix: stabilize release validation gates * fix: finish agent runtime import * test: finish post-rebase agent runtime mocks * fix: keep codex compaction native * fix: stabilize codex app-server hook tests * test: isolate codex diagnostic active run * test: remove codex diagnostic completion race # Conflicts: # extensions/codex/src/app-server/run-attempt.test.ts * ci: fix full release manifest performance run id * refactor: narrow llm plugin sdk boundary * chore: drop generated google boundary stamps * fix: repair rebase fallout * fix: clean up rebased runtime references * fix: decode codex jwt payloads as base64url * fix: preserve shipped pi runtime alias * fix: add scoped sdk virtual modules * fix: decode llm codex oauth jwt as base64url * fix: avoid stale vertex adc negative cache * fix: harden tool arg decoding and codeql path * fix: keep vertex adc negative checks live * refactor: consolidate codex jwt and edit helpers * fix: await codex oauth node runtime imports * fix: preserve sdk tool and notice contracts * fix: preserve shipped compat config boundaries * fix: align codex oauth callback host * fix: terminate agent-core loop streams on failure * fix: keep codex oauth callback alive during fallback * ci: include session tools in critical codeql scans * fix: keep Cloudflare Anthropic provider auth header * docs: redirect legacy pi runtime pages * fix: honor bundled web provider compat discovery * fix: protect session output spill files * fix: keep legacy agent dir env blocked * fix: contain auto-discovered skill symlinks * fix: harden agent core sdk proxy surfaces * fix: restore approval reaction sdk compat * fix: keep live docker runs bounded * fix: keep codex oauth redirect host aligned * fix: resolve post-rebase agent runtime drift * fix: redact anthropic oauth parse failures * fix: preserve responses strict tool shaping * fix: repair agent runtime rebase cleanup * docs: redirect retired parity pages * fix: bound auto-discovered resources to roots * fix: repair post-rebase agent test drift * fix: preserve bundled provider allowlist migration * fix: preserve manifest-owned provider aliases * fix: declare photon image dependency * fix: keep provider headers out of proxy body * fix: preserve shipped env aliases * fix: refresh control ui i18n generated state * fix: quote read fallback paths * fix: preview edits through configured backend * test: satisfy core test typecheck * fix: preserve ZAI usage auth fallback * test: repair codex diagnostic test * fix: repair agent runtime rebase drift * test: finish embedded runner import rename * fix: repair agent runtime rebase integrations * test: align compaction oauth fallback expectations * fix: allow sdk-auth session models * fix: update doctor tool schema import * fix: preserve bedrock plugin region * fix: stream harmony-like prose immediately * ci: include session runtime in codeql shards * fix: repair latest rebase integrations * fix: honor explicit codex websocket transport * fix: keep openai-compatible credentials provider-scoped * fix: refresh sdk api baseline after rebase * fix: route cli runtime aliases through openclaw harness * test: rename stale harness mock expectation * test: rename embedded agent overflow calls * test: clean embedded auth test wording * test: use openclaw stream types in deepinfra cache test * fix: refresh sdk api baseline on latest main * fix: honor bundled discovery compat allowlists * fix: refresh sdk api baseline after latest rebase * fix: remove stale rebase imports * test: rename stale model catalog mock * test: mock renamed doctor runtime modules * fix: map canonical kimi env auth * fix: use internal model registry in bench script * fix: migrate deepinfra provider catalog entry * fix: enforce builtin tool suppression * fix: route compaction auth and proxy payloads safely * refactor: prune unused llm registry leftovers * test: update codex hooks session import * test: fix model picker ci coverage * test: align model picker auth mock types
126 lines
3.9 KiB
TypeScript
126 lines
3.9 KiB
TypeScript
import fs from "node:fs";
|
|
import fsp from "node:fs/promises";
|
|
import path from "node:path";
|
|
import { CURRENT_SESSION_VERSION } from "../../config/sessions/version.js";
|
|
|
|
/** Tail kept so DM continuity survives silent session rotations. */
|
|
export const DEFAULT_REPLAY_MAX_MESSAGES = 6;
|
|
|
|
type SessionRecord = {
|
|
type?: unknown;
|
|
id?: unknown;
|
|
parentId?: unknown;
|
|
timestamp?: unknown;
|
|
message?: { role?: unknown };
|
|
};
|
|
type KeptRecord = { role: "user" | "assistant"; line: string };
|
|
|
|
function isValidReplayTimestamp(value: unknown): boolean {
|
|
if (typeof value === "number") {
|
|
return Number.isFinite(value);
|
|
}
|
|
return typeof value === "string" && value.trim().length > 0;
|
|
}
|
|
|
|
function replayableRole(record: SessionRecord | null): "user" | "assistant" | undefined {
|
|
if (
|
|
!record ||
|
|
record.type !== "message" ||
|
|
typeof record.id !== "string" ||
|
|
record.id.trim().length === 0 ||
|
|
!isValidReplayTimestamp(record.timestamp) ||
|
|
!(
|
|
record.parentId === null ||
|
|
record.parentId === undefined ||
|
|
typeof record.parentId === "string"
|
|
)
|
|
) {
|
|
return undefined;
|
|
}
|
|
const role = record.message?.role;
|
|
return role === "user" || role === "assistant" ? role : undefined;
|
|
}
|
|
|
|
/**
|
|
* Copy the tail of user/assistant JSONL records from a prior transcript into a
|
|
* freshly-rotated one. Tool, system, and compaction records are skipped so
|
|
* replay cannot reshape tool/role ordering, and the tail is aligned and
|
|
* coalesced into alternating user/assistant turns so role-ordering resets
|
|
* cannot immediately recur. Uses async I/O so long transcripts do not block
|
|
* the event loop. Returns 0 on any error.
|
|
*/
|
|
export async function replayRecentUserAssistantMessages(params: {
|
|
sourceTranscript?: string;
|
|
targetTranscript: string;
|
|
newSessionId: string;
|
|
maxMessages?: number;
|
|
}): Promise<number> {
|
|
const max = Math.max(0, params.maxMessages ?? DEFAULT_REPLAY_MAX_MESSAGES);
|
|
const src = params.sourceTranscript;
|
|
if (max === 0 || !src || !fs.existsSync(src)) {
|
|
return 0;
|
|
}
|
|
try {
|
|
const kept: KeptRecord[] = [];
|
|
for (const line of (await fsp.readFile(src, "utf-8")).split(/\r?\n/)) {
|
|
if (!line.trim()) {
|
|
continue;
|
|
}
|
|
try {
|
|
const role = replayableRole(JSON.parse(line) as SessionRecord | null);
|
|
if (role) {
|
|
kept.push({ role, line });
|
|
}
|
|
} catch {
|
|
// Skip malformed lines.
|
|
}
|
|
}
|
|
if (kept.length === 0) {
|
|
return 0;
|
|
}
|
|
let startIdx = Math.max(0, kept.length - max);
|
|
while (startIdx < kept.length && kept[startIdx].role === "assistant") {
|
|
startIdx += 1;
|
|
}
|
|
if (startIdx === kept.length) {
|
|
// Retained window is assistant-only; replaying would re-create the same
|
|
// role-ordering hazard this reset path is recovering from.
|
|
return 0;
|
|
}
|
|
const tail = coalesceAlternatingReplayTail(kept.slice(startIdx)).map((entry) => entry.line);
|
|
if (!fs.existsSync(params.targetTranscript)) {
|
|
await fsp.mkdir(path.dirname(params.targetTranscript), { recursive: true });
|
|
const header = JSON.stringify({
|
|
type: "session",
|
|
version: CURRENT_SESSION_VERSION,
|
|
id: params.newSessionId,
|
|
timestamp: new Date().toISOString(),
|
|
cwd: process.cwd(),
|
|
});
|
|
await fsp.writeFile(params.targetTranscript, `${header}\n`, {
|
|
encoding: "utf-8",
|
|
mode: 0o600,
|
|
});
|
|
}
|
|
await fsp.appendFile(params.targetTranscript, `${tail.join("\n")}\n`, "utf-8");
|
|
return tail.length;
|
|
} catch {
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
// Keep the newest record from each same-role run, preserving original JSONL bytes
|
|
// for replay while ensuring strict provider alternation.
|
|
function coalesceAlternatingReplayTail(entries: KeptRecord[]): KeptRecord[] {
|
|
const tail: KeptRecord[] = [];
|
|
for (const entry of entries) {
|
|
const lastIdx = tail.length - 1;
|
|
if (lastIdx >= 0 && tail[lastIdx]?.role === entry.role) {
|
|
tail[lastIdx] = entry;
|
|
continue;
|
|
}
|
|
tail.push(entry);
|
|
}
|
|
return tail;
|
|
}
|