Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-07 05:47:26 +02:00
Code Issues Packages Projects Releases Activity

fix: address review — shared PROTECTED_SYSTEM_NOTES, protection checks, soft delete description

Browse Source 
- Move PROTECTED_SYSTEM_NOTES to helpers.ts for shared use
- move_note: check against full system notes set, add protected parent check
- clone_note: add source note protection + protected parent checks
- delete_note: fix description to say 'soft delete' (recoverable)
This commit is contained in:
Tomáš Adámek
2026-04-08 16:08:02 +02:00
parent d771454aa5
commit 5938fa6ffb
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/server/src/services/llm/tools/helpers.ts
View File

@@ -13,6 +13,9 @@ const ATTACHMENT_PREVIEW_MAX_LENGTH = 200;
/** Skip expensive content loading/conversion for notes larger than this. */
const CONTENT_PREVIEW_SIZE_THRESHOLD = 10_000;
/** Note IDs that must not be deleted, moved, or cloned by the LLM. */
export const PROTECTED_SYSTEM_NOTES = new Set(["root", "_hidden", "_share", "_lbRoot", "_globalNoteMap"]);
/**
* Return `true` if the value is truthy, otherwise `undefined`.
* Since `undefined` values are omitted from JSON serialization,

26
apps/server/src/services/llm/tools/hierarchy_tools.ts
View File

@@ -8,6 +8,7 @@ import becca from "../../../becca/becca.js";
import type BNote from "../../../becca/entities/bnote.js";
import branchService from "../../branches.js";
import cloningService from "../../cloning.js";
import { PROTECTED_SYSTEM_NOTES } from "./helpers.js";
import { defineTools } from "./tool_registry.js";
//#region Subtree tool implementation
@@ -105,8 +106,8 @@ export const hierarchyTools = defineTools({
if (!note) {
return { error: "Note not found" };
}
if (note.noteId === "root") {
return { error: "Cannot move the root note" };
if (PROTECTED_SYSTEM_NOTES.has(noteId)) {
return { error: "Cannot move system notes" };
}
if (note.isProtected) {
return { error: "Note is protected and cannot be moved" };
@@ -116,6 +117,9 @@ export const hierarchyTools = defineTools({
if (!targetParent) {
return { error: "Target parent note not found" };
}
if (!targetParent.isContentAvailable()) {
return { error: "Cannot move note to a protected parent" };
}
// Use the first (primary) parent branch for the move
const branches = note.getParentBranches();
@@ -152,18 +156,28 @@ export const hierarchyTools = defineTools({
}),
mutates: true,
execute: ({ noteId, parentNoteId, prefix }) => {
const note = becca.getNote(noteId);
if (!note) {
return { error: "Note not found" };
}
if (note.isProtected) {
return { error: "Note is protected and cannot be cloned" };
}
const parent = becca.getNote(parentNoteId);
if (parent && !parent.isContentAvailable()) {
return { error: "Cannot clone note to a protected parent" };
}
const result = cloningService.cloneNoteToParentNote(noteId, parentNoteId, prefix ?? null);
if (!result.success) {
return { error: result.message || "Clone failed" };
}
const note = becca.getNote(noteId);
const parent = becca.getNote(parentNoteId);
return {
success: true,
noteId,
title: note?.getTitleOrProtected() ?? noteId,
title: note.getTitleOrProtected(),
parentNoteId,
parentTitle: parent?.getTitleOrProtected() ?? parentNoteId,
branchId: result.branchId

7
apps/server/src/services/llm/tools/note_tools.ts
View File

@@ -10,12 +10,9 @@ import noteService from "../../notes.js";
import SearchContext from "../../search/search_context.js";
import searchService from "../../search/services/search.js";
import TaskContext from "../../task_context.js";
import { TOOL_LIMITS, getContentPreview, getNoteContentForLlm, getNoteMeta, setNoteContentFromLlm } from "./helpers.js";
import { PROTECTED_SYSTEM_NOTES, TOOL_LIMITS, getContentPreview, getNoteContentForLlm, getNoteMeta, setNoteContentFromLlm } from "./helpers.js";
import { defineTools } from "./tool_registry.js";
/** Note IDs that must not be deleted or moved by the LLM. */
const PROTECTED_SYSTEM_NOTES = new Set(["root", "_hidden", "_share", "_lbRoot", "_globalNoteMap"]);
export const noteTools = defineTools({
search_notes: {
description: [
@@ -270,7 +267,7 @@ export const noteTools = defineTools({
},
delete_note: {
description: "Delete a note and all its branches (parent links). This is irreversible. The note will be marked as deleted. Cannot delete system notes (root, _hidden, etc.).",
description: "Delete a note and all its branches (parent links). This is a soft delete (recoverable via 'Recent Changes'). Cannot delete system notes (root, _hidden, etc.).",
inputSchema: z.object({
noteId: z.string().describe("The ID of the note to delete")
}),