refactor: cleanup dead code and standardize logging
This commit is contained in:
parent
6af205a13a
commit
c2486e6806
@ -83,10 +83,7 @@ vi.mock("@opentelemetry/sdk-trace-base", () => ({
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("@opentelemetry/resources", () => ({
|
vi.mock("@opentelemetry/resources", () => ({
|
||||||
Resource: class {
|
Resource: class {},
|
||||||
// eslint-disable-next-line @typescript-eslint/no-useless-constructor
|
|
||||||
constructor(_value?: unknown) {}
|
|
||||||
},
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("@opentelemetry/semantic-conventions", () => ({
|
vi.mock("@opentelemetry/semantic-conventions", () => ({
|
||||||
|
|||||||
@ -52,12 +52,14 @@ function filterSkillEntries(
|
|||||||
if (skillFilter !== undefined) {
|
if (skillFilter !== undefined) {
|
||||||
const normalized = skillFilter.map((entry) => String(entry).trim()).filter(Boolean);
|
const normalized = skillFilter.map((entry) => String(entry).trim()).filter(Boolean);
|
||||||
const label = normalized.length > 0 ? normalized.join(", ") : "(none)";
|
const label = normalized.length > 0 ? normalized.join(", ") : "(none)";
|
||||||
console.log(`[skills] Applying skill filter: ${label}`);
|
skillsLogger.debug(`Applying skill filter: ${label}`);
|
||||||
filtered =
|
filtered =
|
||||||
normalized.length > 0
|
normalized.length > 0
|
||||||
? filtered.filter((entry) => normalized.includes(entry.skill.name))
|
? filtered.filter((entry) => normalized.includes(entry.skill.name))
|
||||||
: [];
|
: [];
|
||||||
console.log(`[skills] After filter: ${filtered.map((entry) => entry.skill.name).join(", ")}`);
|
skillsLogger.debug(
|
||||||
|
`After filter: ${filtered.map((entry) => entry.skill.name).join(", ")}`,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
return filtered;
|
return filtered;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -68,8 +68,6 @@ const saveSessionToMemory: HookHandler = async (event) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
console.log("[session-memory] Hook triggered for /new command");
|
|
||||||
|
|
||||||
const context = event.context || {};
|
const context = event.context || {};
|
||||||
const cfg = context.cfg as OpenClawConfig | undefined;
|
const cfg = context.cfg as OpenClawConfig | undefined;
|
||||||
const agentId = resolveAgentIdFromSessionKey(event.sessionKey);
|
const agentId = resolveAgentIdFromSessionKey(event.sessionKey);
|
||||||
@ -91,10 +89,6 @@ const saveSessionToMemory: HookHandler = async (event) => {
|
|||||||
const currentSessionId = sessionEntry.sessionId as string;
|
const currentSessionId = sessionEntry.sessionId as string;
|
||||||
const currentSessionFile = sessionEntry.sessionFile as string;
|
const currentSessionFile = sessionEntry.sessionFile as string;
|
||||||
|
|
||||||
console.log("[session-memory] Current sessionId:", currentSessionId);
|
|
||||||
console.log("[session-memory] Current sessionFile:", currentSessionFile);
|
|
||||||
console.log("[session-memory] cfg present:", !!cfg);
|
|
||||||
|
|
||||||
const sessionFile = currentSessionFile || undefined;
|
const sessionFile = currentSessionFile || undefined;
|
||||||
|
|
||||||
// Read message count from hook config (default: 15)
|
// Read message count from hook config (default: 15)
|
||||||
@ -110,10 +104,8 @@ const saveSessionToMemory: HookHandler = async (event) => {
|
|||||||
if (sessionFile) {
|
if (sessionFile) {
|
||||||
// Get recent conversation content
|
// Get recent conversation content
|
||||||
sessionContent = await getRecentSessionContent(sessionFile, messageCount);
|
sessionContent = await getRecentSessionContent(sessionFile, messageCount);
|
||||||
console.log("[session-memory] sessionContent length:", sessionContent?.length || 0);
|
|
||||||
|
|
||||||
if (sessionContent && cfg) {
|
if (sessionContent && cfg) {
|
||||||
console.log("[session-memory] Calling generateSlugViaLLM...");
|
|
||||||
// Dynamically import the LLM slug generator (avoids module caching issues)
|
// Dynamically import the LLM slug generator (avoids module caching issues)
|
||||||
// When compiled, handler is at dist/hooks/bundled/session-memory/handler.js
|
// When compiled, handler is at dist/hooks/bundled/session-memory/handler.js
|
||||||
// Going up ../.. puts us at dist/hooks/, so just add llm-slug-generator.js
|
// Going up ../.. puts us at dist/hooks/, so just add llm-slug-generator.js
|
||||||
@ -123,7 +115,6 @@ const saveSessionToMemory: HookHandler = async (event) => {
|
|||||||
|
|
||||||
// Use LLM to generate a descriptive slug
|
// Use LLM to generate a descriptive slug
|
||||||
slug = await generateSlugViaLLM({ sessionContent, cfg });
|
slug = await generateSlugViaLLM({ sessionContent, cfg });
|
||||||
console.log("[session-memory] Generated slug:", slug);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -131,14 +122,11 @@ const saveSessionToMemory: HookHandler = async (event) => {
|
|||||||
if (!slug) {
|
if (!slug) {
|
||||||
const timeSlug = now.toISOString().split("T")[1]!.split(".")[0]!.replace(/:/g, "");
|
const timeSlug = now.toISOString().split("T")[1]!.split(".")[0]!.replace(/:/g, "");
|
||||||
slug = timeSlug.slice(0, 4); // HHMM
|
slug = timeSlug.slice(0, 4); // HHMM
|
||||||
console.log("[session-memory] Using fallback timestamp slug:", slug);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create filename with date and slug
|
// Create filename with date and slug
|
||||||
const filename = `${dateStr}-${slug}.md`;
|
const filename = `${dateStr}-${slug}.md`;
|
||||||
const memoryFilePath = path.join(memoryDir, filename);
|
const memoryFilePath = path.join(memoryDir, filename);
|
||||||
console.log("[session-memory] Generated filename:", filename);
|
|
||||||
console.log("[session-memory] Full path:", memoryFilePath);
|
|
||||||
|
|
||||||
// Format time as HH:MM:SS UTC
|
// Format time as HH:MM:SS UTC
|
||||||
const timeStr = now.toISOString().split("T")[1]!.split(".")[0];
|
const timeStr = now.toISOString().split("T")[1]!.split(".")[0];
|
||||||
@ -166,11 +154,6 @@ const saveSessionToMemory: HookHandler = async (event) => {
|
|||||||
|
|
||||||
// Write to new memory file
|
// Write to new memory file
|
||||||
await fs.writeFile(memoryFilePath, entry, "utf-8");
|
await fs.writeFile(memoryFilePath, entry, "utf-8");
|
||||||
console.log("[session-memory] Memory file written successfully");
|
|
||||||
|
|
||||||
// Log completion (but don't send user-visible confirmation - it's internal housekeeping)
|
|
||||||
const relPath = memoryFilePath.replace(os.homedir(), "~");
|
|
||||||
console.log(`[session-memory] Session context saved to ${relPath}`);
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(
|
console.error(
|
||||||
"[session-memory] Failed to save session memory:",
|
"[session-memory] Failed to save session memory:",
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user