Commit d58af33fba73936659158ba2167a00475889d1e5 | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-03-01 19:01:47-08:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-03-01 20:06:21-08:00
log	d58af33fba73936659158ba2167a00475889d1e5
tree	559a9e8b6911edf3cf4968be9e2ed8123cbde5c4
parent	a56418f8bc9866ab114c85b4e73a7f95987c3469

Fix attachment cleanup to match exact thread segments

- Parse thread segments from attachment IDs using a UUID-aware pattern
- Prevent revert/delete cleanup from removing files belonging to similarly prefixed threads
- Add tests for prefix-collision cases in attachment store and projection pipeline

4 files changed, 72 insertions(+), 9 deletions(-)

apps
- server
  - src
    attachmentStore.test.ts
    attachmentStore.ts
    orchestration
    Layers
    ProjectionPipeline.test.ts
    ProjectionPipeline.ts

apps/server/src/attachmentStore.test.ts+14-2

 @@ -4,7 +4,11 @@ import path from "node:path";
 import { describe, expect, it } from "vitest";
-import { createAttachmentId, resolveAttachmentPathById } from "./attachmentStore.ts";
+import {
+  createAttachmentId,
+  parseThreadSegmentFromAttachmentId,
+  resolveAttachmentPathById,
+} from "./attachmentStore.ts";
 describe("attachmentStore", () => {
   it("sanitizes thread ids when creating attachment ids", () => {
 @@ -14,7 +18,7 @@ describe("attachmentStore", () => {
       return;
     }
-    const [threadSegment] = attachmentId.split("-", 1);
+    const threadSegment = parseThreadSegmentFromAttachmentId(attachmentId);
     expect(threadSegment).toBeTruthy();
     expect(threadSegment).toMatch(/^[a-z0-9_-]+$/i);
     expect(threadSegment).not.toContain(".");
 @@ -22,6 +26,14 @@ describe("attachmentStore", () => {
     expect(threadSegment).not.toContain("/");
   });
+  it("parses exact thread segments from attachment ids without prefix collisions", () => {
+    const fooId = "foo-00000000-0000-4000-8000-000000000001";
+    const fooBarId = "foo-bar-00000000-0000-4000-8000-000000000002";
+    expect(parseThreadSegmentFromAttachmentId(fooId)).toBe("foo");
+    expect(parseThreadSegmentFromAttachmentId(fooBarId)).toBe("foo-bar");
+  });
   it("resolves attachment path by id using the extension that exists on disk", () => {
     const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), "t3code-attachment-store-"));
     try {

apps/server/src/attachmentStore.ts+19

...	@@ -12,6 +12,13 @@ import { inferImageExtension, SAFE_IMAGE_FILE_EXTENSIONS } from "./imageMime.ts"	...	@@ -12,6 +12,13 @@ import { inferImageExtension, SAFE_IMAGE_FILE_EXTENSIONS } from "./imageMime.ts"
12		12
13	const ATTACHMENT_FILENAME_EXTENSIONS = [...SAFE_IMAGE_FILE_EXTENSIONS, ".bin"];	13	const ATTACHMENT_FILENAME_EXTENSIONS = [...SAFE_IMAGE_FILE_EXTENSIONS, ".bin"];
14	const ATTACHMENT_ID_THREAD_SEGMENT_MAX_CHARS = 80;	14	const ATTACHMENT_ID_THREAD_SEGMENT_MAX_CHARS = 80;
		15	const ATTACHMENT_ID_THREAD_SEGMENT_PATTERN = "[a-z0-9_]+(?:-[a-z0-9_]+)*";
		16	const ATTACHMENT_ID_UUID_PATTERN =
		17	"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
		18	const ATTACHMENT_ID_PATTERN = new RegExp(
		19	`^(${ATTACHMENT_ID_THREAD_SEGMENT_PATTERN})-(${ATTACHMENT_ID_UUID_PATTERN})$`,
		20	"i",
		21	);
15		22
16	export function toSafeThreadAttachmentSegment(threadId: string): string \| null {	23	export function toSafeThreadAttachmentSegment(threadId: string): string \| null {
17	const segment = threadId	24	const segment = threadId
...	@@ -35,6 +42,18 @@ export function createAttachmentId(threadId: string): string \| null {	...	@@ -35,6 +42,18 @@ export function createAttachmentId(threadId: string): string \| null {
35	return `${threadSegment}-${randomUUID()}`;	42	return `${threadSegment}-${randomUUID()}`;
36	}	43	}
37		44
		45	export function parseThreadSegmentFromAttachmentId(attachmentId: string): string \| null {
		46	const normalizedId = normalizeAttachmentRelativePath(attachmentId);
		47	if (!normalizedId \|\| normalizedId.includes("/") \|\| normalizedId.includes(".")) {
		48	return null;
		49	}
		50	const match = normalizedId.match(ATTACHMENT_ID_PATTERN);
		51	if (!match) {
		52	return null;
		53	}
		54	return match[1]?.toLowerCase() ?? null;
		55	}
		56
38	export function attachmentRelativePath(attachment: ChatAttachment): string {	57	export function attachmentRelativePath(attachment: ChatAttachment): string {
39	switch (attachment.type) {	58	switch (attachment.type) {
40	case "image": {	59	case "image": {

apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts+19-3

 @@ -734,8 +734,10 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
           const eventStore = yield* OrchestrationEventStore;
           const now = new Date().toISOString();
           const threadId = ThreadId.makeUnsafe("thread revert.files");
-          const keepAttachmentId = "thread-revert-files-keep";
+          const keepAttachmentId = "thread-revert-files-00000000-0000-4000-8000-000000000001";
-          const removeAttachmentId = "thread-revert-files-remove";
+          const removeAttachmentId = "thread-revert-files-00000000-0000-4000-8000-000000000002";
+          const otherThreadAttachmentId =
+            "thread-revert-files-extra-00000000-0000-4000-8000-000000000003";
           const appendAndProject = (event: Parameters<typeof eventStore.append>[0]) =>
             eventStore
 @@ -904,8 +906,11 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
       fs.mkdirSync(path.join(stateDir, "attachments"), { recursive: true });
       fs.writeFileSync(keepPath, Buffer.from("keep"));
       fs.writeFileSync(removePath, Buffer.from("remove"));
+      const otherThreadPath = path.join(stateDir, "attachments", `${otherThreadAttachmentId}.png`);
+      fs.writeFileSync(otherThreadPath, Buffer.from("other"));
       assert.equal(fs.existsSync(keepPath), true);
       assert.equal(fs.existsSync(removePath), true);
+      assert.equal(fs.existsSync(otherThreadPath), true);
       yield* appendAndProject({
         type: "thread.reverted",
 @@ -925,6 +930,7 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
           assert.equal(fs.existsSync(keepPath), true);
           assert.equal(fs.existsSync(removePath), false);
+          assert.equal(fs.existsSync(otherThreadPath), true);
         }).pipe(
           (effect) => runWithProjectionPipelineLayer(stateDir, effect),
           Effect.ensuring(Effect.sync(() => fs.rmSync(stateDir, { recursive: true, force: true }))),
 @@ -943,7 +949,9 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
           const eventStore = yield* OrchestrationEventStore;
           const now = new Date().toISOString();
           const threadId = ThreadId.makeUnsafe("thread delete.files");
-          const attachmentId = "thread-delete-files-att-1";
+          const attachmentId = "thread-delete-files-00000000-0000-4000-8000-000000000001";
+          const otherThreadAttachmentId =
+            "thread-delete-files-extra-00000000-0000-4000-8000-000000000002";
           const appendAndProject = (event: Parameters<typeof eventStore.append>[0]) =>
             eventStore
 @@ -1025,9 +1033,16 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
       });
       const threadAttachmentPath = path.join(stateDir, "attachments", `${attachmentId}.png`);
+      const otherThreadAttachmentPath = path.join(
+        stateDir,
+        "attachments",
+        `${otherThreadAttachmentId}.png`,
+      );
       fs.mkdirSync(path.join(stateDir, "attachments"), { recursive: true });
       fs.writeFileSync(threadAttachmentPath, Buffer.from("delete"));
+      fs.writeFileSync(otherThreadAttachmentPath, Buffer.from("other-thread"));
       assert.equal(fs.existsSync(threadAttachmentPath), true);
+      assert.equal(fs.existsSync(otherThreadAttachmentPath), true);
       yield* appendAndProject({
         type: "thread.deleted",
 @@ -1046,6 +1061,7 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
       });
           assert.equal(fs.existsSync(threadAttachmentPath), false);
+          assert.equal(fs.existsSync(otherThreadAttachmentPath), true);
         }).pipe(
           (effect) => runWithProjectionPipelineLayer(stateDir, effect),
           Effect.ensuring(Effect.sync(() => fs.rmSync(stateDir, { recursive: true, force: true }))),

apps/server/src/orchestration/Layers/ProjectionPipeline.ts+20-4

 @@ -37,7 +37,12 @@ import {
   OrchestrationProjectionPipeline,
   type OrchestrationProjectionPipelineShape,
 } from "../Services/ProjectionPipeline.ts";
-import { attachmentRelativePath, toSafeThreadAttachmentSegment } from "../../attachmentStore.ts";
+import {
+  attachmentRelativePath,
+  parseAttachmentIdFromRelativePath,
+  parseThreadSegmentFromAttachmentId,
+  toSafeThreadAttachmentSegment,
+} from "../../attachmentStore.ts";
 export const ORCHESTRATION_PROJECTOR_NAMES = {
   projects: "projection.projects",
 @@ -198,7 +203,8 @@ function collectThreadAttachmentRelativePaths(
       if (attachment.type !== "image") {
         continue;
       }
-      if (!attachment.id.startsWith(`${threadSegment}-`)) {
+      const attachmentThreadSegment = parseThreadSegmentFromAttachmentId(attachment.id);
+      if (!attachmentThreadSegment || attachmentThreadSegment !== threadSegment) {
         continue;
       }
       relativePaths.add(attachmentRelativePath(attachment));
 @@ -236,7 +242,12 @@ const runAttachmentSideEffects = Effect.fn(function* (sideEffects: AttachmentSid
               if (normalizedEntry.length === 0 || normalizedEntry.includes("/")) {
                 return;
               }
-              if (!normalizedEntry.startsWith(`${threadSegment}-`)) {
+              const attachmentId = parseAttachmentIdFromRelativePath(normalizedEntry);
+              if (!attachmentId) {
+                return;
+              }
+              const attachmentThreadSegment = parseThreadSegmentFromAttachmentId(attachmentId);
+              if (!attachmentThreadSegment || attachmentThreadSegment !== threadSegment) {
                 return;
               }
               yield* fileSystem.remove(path.join(attachmentsRootDir, normalizedEntry), {
 @@ -272,7 +283,12 @@ const runAttachmentSideEffects = Effect.fn(function* (sideEffects: AttachmentSid
               if (relativePath.length === 0 || relativePath.includes("/")) {
                 return;
               }
-              if (!relativePath.startsWith(`${threadSegment}-`)) {
+              const attachmentId = parseAttachmentIdFromRelativePath(relativePath);
+              if (!attachmentId) {
+                return;
+              }
+              const attachmentThreadSegment = parseThreadSegmentFromAttachmentId(attachmentId);
+              if (!attachmentThreadSegment || attachmentThreadSegment !== threadSegment) {
                 return;
               }