Commit a56418f8bc9866ab114c85b4e73a7f95987c3469 | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-03-01 18:49:25-08:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-03-01 20:06:21-08:00
log	a56418f8bc9866ab114c85b4e73a7f95987c3469
tree	0d617efbcc51530c20cd1e35e8052bae174f486a
parent	596e1590dfd602ffcf1efd77b5d9a0eac465f374

Reuse attachment thread segment sanitizer in projection pipeline

- export and reuse `toSafeThreadAttachmentSegment` from `attachmentStore`
- align projection attachment path logic with store-safe thread IDs
- update projection pipeline tests to cover thread IDs with spaces

3 files changed, 36 insertions(+), 47 deletions(-)

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

apps/server/src/attachmentStore.ts+1-1

...	@@ -13,7 +13,7 @@ import { inferImageExtension, SAFE_IMAGE_FILE_EXTENSIONS } from "./imageMime.ts"	...	@@ -13,7 +13,7 @@ import { inferImageExtension, SAFE_IMAGE_FILE_EXTENSIONS } from "./imageMime.ts"
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		15
16	function toSafeThreadAttachmentSegment(threadId: string): string \| null {	16	export function toSafeThreadAttachmentSegment(threadId: string): string \| null {
17	const segment = threadId	17	const segment = threadId
18	.trim()	18	.trim()
19	.replace(/[^a-z0-9_-]+/gi, "-")	19	.replace(/[^a-z0-9_-]+/gi, "-")

apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts+29-24

 @@ -733,6 +733,9 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
           const projectionPipeline = yield* OrchestrationProjectionPipeline;
           const eventStore = yield* OrchestrationEventStore;
           const now = new Date().toISOString();
+          const threadId = ThreadId.makeUnsafe("thread revert.files");
+          const keepAttachmentId = "thread-revert-files-keep";
+          const removeAttachmentId = "thread-revert-files-remove";
           const appendAndProject = (event: Parameters<typeof eventStore.append>[0]) =>
             eventStore
 @@ -764,14 +767,14 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
         type: "thread.created",
         eventId: EventId.makeUnsafe("evt-revert-files-2"),
         aggregateKind: "thread",
-        aggregateId: ThreadId.makeUnsafe("thread-revert-files"),
+        aggregateId: threadId,
         occurredAt: now,
         commandId: CommandId.makeUnsafe("cmd-revert-files-2"),
         causationEventId: null,
         correlationId: CorrelationId.makeUnsafe("cmd-revert-files-2"),
         metadata: {},
         payload: {
-          threadId: ThreadId.makeUnsafe("thread-revert-files"),
+          threadId,
           projectId: ProjectId.makeUnsafe("project-revert-files"),
           title: "Thread Revert Files",
           model: "gpt-5-codex",
 @@ -786,14 +789,14 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
         type: "thread.turn-diff-completed",
         eventId: EventId.makeUnsafe("evt-revert-files-3"),
         aggregateKind: "thread",
-        aggregateId: ThreadId.makeUnsafe("thread-revert-files"),
+        aggregateId: threadId,
         occurredAt: now,
         commandId: CommandId.makeUnsafe("cmd-revert-files-3"),
         causationEventId: null,
         correlationId: CorrelationId.makeUnsafe("cmd-revert-files-3"),
         metadata: {},
         payload: {
-          threadId: ThreadId.makeUnsafe("thread-revert-files"),
+          threadId,
           turnId: TurnId.makeUnsafe("turn-keep"),
           checkpointTurnCount: 1,
           checkpointRef: CheckpointRef.makeUnsafe("refs/t3/checkpoints/thread-revert-files/turn/1"),
 @@ -808,21 +811,21 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
         type: "thread.message-sent",
         eventId: EventId.makeUnsafe("evt-revert-files-4"),
         aggregateKind: "thread",
-        aggregateId: ThreadId.makeUnsafe("thread-revert-files"),
+        aggregateId: threadId,
         occurredAt: now,
         commandId: CommandId.makeUnsafe("cmd-revert-files-4"),
         causationEventId: null,
         correlationId: CorrelationId.makeUnsafe("cmd-revert-files-4"),
         metadata: {},
         payload: {
-          threadId: ThreadId.makeUnsafe("thread-revert-files"),
+          threadId,
           messageId: MessageId.makeUnsafe("message-keep"),
           role: "assistant",
           text: "Keep",
           attachments: [
             {
               type: "image",
-              id: "thread-revert-files-keep",
+              id: keepAttachmentId,
               name: "keep.png",
               mimeType: "image/png",
               sizeBytes: 5,
 @@ -839,14 +842,14 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
         type: "thread.turn-diff-completed",
         eventId: EventId.makeUnsafe("evt-revert-files-5"),
         aggregateKind: "thread",
-        aggregateId: ThreadId.makeUnsafe("thread-revert-files"),
+        aggregateId: threadId,
         occurredAt: now,
         commandId: CommandId.makeUnsafe("cmd-revert-files-5"),
         causationEventId: null,
         correlationId: CorrelationId.makeUnsafe("cmd-revert-files-5"),
         metadata: {},
         payload: {
-          threadId: ThreadId.makeUnsafe("thread-revert-files"),
+          threadId,
           turnId: TurnId.makeUnsafe("turn-remove"),
           checkpointTurnCount: 2,
           checkpointRef: CheckpointRef.makeUnsafe("refs/t3/checkpoints/thread-revert-files/turn/2"),
 @@ -861,21 +864,21 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
         type: "thread.message-sent",
         eventId: EventId.makeUnsafe("evt-revert-files-6"),
         aggregateKind: "thread",
-        aggregateId: ThreadId.makeUnsafe("thread-revert-files"),
+        aggregateId: threadId,
         occurredAt: now,
         commandId: CommandId.makeUnsafe("cmd-revert-files-6"),
         causationEventId: null,
         correlationId: CorrelationId.makeUnsafe("cmd-revert-files-6"),
         metadata: {},
         payload: {
-          threadId: ThreadId.makeUnsafe("thread-revert-files"),
+          threadId,
           messageId: MessageId.makeUnsafe("message-remove"),
           role: "assistant",
           text: "Remove",
           attachments: [
             {
               type: "image",
-              id: "thread-revert-files-remove",
+              id: removeAttachmentId,
               name: "remove.png",
               mimeType: "image/png",
               sizeBytes: 5,
 @@ -891,12 +894,12 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
       const keepPath = path.join(
         stateDir,
         "attachments",
-        "thread-revert-files-keep.png",
+        `${keepAttachmentId}.png`,
       );
       const removePath = path.join(
         stateDir,
         "attachments",
-        "thread-revert-files-remove.png",
+        `${removeAttachmentId}.png`,
       );
       fs.mkdirSync(path.join(stateDir, "attachments"), { recursive: true });
       fs.writeFileSync(keepPath, Buffer.from("keep"));
 @@ -908,14 +911,14 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
         type: "thread.reverted",
         eventId: EventId.makeUnsafe("evt-revert-files-7"),
         aggregateKind: "thread",
-        aggregateId: ThreadId.makeUnsafe("thread-revert-files"),
+        aggregateId: threadId,
         occurredAt: now,
         commandId: CommandId.makeUnsafe("cmd-revert-files-7"),
         causationEventId: null,
         correlationId: CorrelationId.makeUnsafe("cmd-revert-files-7"),
         metadata: {},
         payload: {
-          threadId: ThreadId.makeUnsafe("thread-revert-files"),
+          threadId,
           turnCount: 1,
         },
       });
 @@ -939,6 +942,8 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
           const projectionPipeline = yield* OrchestrationProjectionPipeline;
           const eventStore = yield* OrchestrationEventStore;
           const now = new Date().toISOString();
+          const threadId = ThreadId.makeUnsafe("thread delete.files");
+          const attachmentId = "thread-delete-files-att-1";
           const appendAndProject = (event: Parameters<typeof eventStore.append>[0]) =>
             eventStore
 @@ -970,14 +975,14 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
         type: "thread.created",
         eventId: EventId.makeUnsafe("evt-delete-files-2"),
         aggregateKind: "thread",
-        aggregateId: ThreadId.makeUnsafe("thread-delete-files"),
+        aggregateId: threadId,
         occurredAt: now,
         commandId: CommandId.makeUnsafe("cmd-delete-files-2"),
         causationEventId: null,
         correlationId: CorrelationId.makeUnsafe("cmd-delete-files-2"),
         metadata: {},
         payload: {
-          threadId: ThreadId.makeUnsafe("thread-delete-files"),
+          threadId,
           projectId: ProjectId.makeUnsafe("project-delete-files"),
           title: "Thread Delete Files",
           model: "gpt-5-codex",
 @@ -992,21 +997,21 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
         type: "thread.message-sent",
         eventId: EventId.makeUnsafe("evt-delete-files-3"),
         aggregateKind: "thread",
-        aggregateId: ThreadId.makeUnsafe("thread-delete-files"),
+        aggregateId: threadId,
         occurredAt: now,
         commandId: CommandId.makeUnsafe("cmd-delete-files-3"),
         causationEventId: null,
         correlationId: CorrelationId.makeUnsafe("cmd-delete-files-3"),
         metadata: {},
         payload: {
-          threadId: ThreadId.makeUnsafe("thread-delete-files"),
+          threadId,
           messageId: MessageId.makeUnsafe("message-delete-files"),
           role: "user",
           text: "Delete",
           attachments: [
             {
               type: "image",
-              id: "thread-delete-files-att-1",
+              id: attachmentId,
               name: "delete.png",
               mimeType: "image/png",
               sizeBytes: 5,
 @@ -1019,7 +1024,7 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
         },
       });
-      const threadAttachmentPath = path.join(stateDir, "attachments", "thread-delete-files-att-1.png");
+      const threadAttachmentPath = path.join(stateDir, "attachments", `${attachmentId}.png`);
       fs.mkdirSync(path.join(stateDir, "attachments"), { recursive: true });
       fs.writeFileSync(threadAttachmentPath, Buffer.from("delete"));
       assert.equal(fs.existsSync(threadAttachmentPath), true);
 @@ -1028,14 +1033,14 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {
         type: "thread.deleted",
         eventId: EventId.makeUnsafe("evt-delete-files-4"),
         aggregateKind: "thread",
-        aggregateId: ThreadId.makeUnsafe("thread-delete-files"),
+        aggregateId: threadId,
         occurredAt: now,
         commandId: CommandId.makeUnsafe("cmd-delete-files-4"),
         causationEventId: null,
         correlationId: CorrelationId.makeUnsafe("cmd-delete-files-4"),
         metadata: {},
         payload: {
-          threadId: ThreadId.makeUnsafe("thread-delete-files"),
+          threadId,
           deletedAt: now,
         },
       });

apps/server/src/orchestration/Layers/ProjectionPipeline.ts+6-22

 @@ -37,7 +37,7 @@ import {
   OrchestrationProjectionPipeline,
   type OrchestrationProjectionPipelineShape,
 } from "../Services/ProjectionPipeline.ts";
-import { attachmentRelativePath } from "../../attachmentStore.ts";
+import { attachmentRelativePath, toSafeThreadAttachmentSegment } from "../../attachmentStore.ts";
 export const ORCHESTRATION_PROJECTOR_NAMES = {
   projects: "projection.projects",
 @@ -66,27 +66,11 @@ interface AttachmentSideEffects {
   readonly prunedThreadRelativePaths: Map<string, Set<string>>;
 }
-function toSafeThreadAttachmentSegment(threadId: string): string | null {
+const materializeAttachmentsForProjection = Effect.fn(
-  const segment = encodeURIComponent(threadId);
+  (input: {
-  if (
+    readonly attachments: ReadonlyArray<ChatAttachment>;
-    segment.length === 0 ||
+  }) => Effect.succeed(input.attachments.length === 0 ? [] : input.attachments),
-    segment === "." ||
+);
-    segment === ".." ||
-    segment.includes("/") ||
-    segment.includes("\\") ||
-    segment.includes("\0")
-  ) {
-    return null;
-  }
-  return segment;
-}
-const materializeAttachmentsForProjection = Effect.fn(function* (input: {
-  readonly attachments: ReadonlyArray<ChatAttachment>;
-}) {
-  if (input.attachments.length === 0) return [];
-  return input.attachments;
-});
 function extractActivityRequestId(payload: unknown): ApprovalRequestId | null {
   if (typeof payload !== "object" || payload === null) {