@sentry/junior-memory 0.78.0 → 0.80.0

package/dist/agent.d.ts

@@ -1,9 +1,5 @@
 import type { PluginModel } from "@sentry/junior-plugin-api";
 import { z } from "zod";
-declare const memoryTargetSchema: z.ZodEnum<{
-    requester: "requester";
-    conversation: "conversation";
-}>;
 declare const createMemoryRequestSchema: z.ZodObject<{
     content: z.ZodString;
     expiresAtMs: z.ZodOptional<z.ZodNumber>;
@@ -103,9 +99,10 @@ declare const extractSessionRequestSchema: z.ZodObject<{
 }, z.core.$strict>;
 declare const memoryReviewDecisionSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     decision: z.ZodLiteral<"store">;
-    target: z.ZodEnum<{
-        requester: "requester";
-        conversation: "conversation";
+    kind: z.ZodEnum<{
+        preference: "preference";
+        procedure: "procedure";
+        knowledge: "knowledge";
     }>;
     content: z.ZodString;
     expiresAtMs: z.ZodOptional<z.ZodNumber>;
@@ -122,21 +119,27 @@ declare const memoryReviewDecisionSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
         unsupported_scope: "unsupported_scope";
     }>;
 }, z.core.$strict>], "decision">;
-export type MemoryTarget = z.output<typeof memoryTargetSchema>;
+declare const extractedMemoryResultSchema: z.ZodObject<{
+    content: z.ZodString;
+    expiresAtMs: z.ZodNullable<z.ZodNumber>;
+    kind: z.ZodEnum<{
+        preference: "preference";
+        procedure: "procedure";
+        knowledge: "knowledge";
+    }>;
+}, z.core.$strict>;
 export type MemoryReview = z.output<typeof memoryReviewDecisionSchema>;
 export type CreateMemoryRequest = z.output<typeof createMemoryRequestSchema>;
 export type ExtractSessionRequest = z.output<typeof extractSessionRequestSchema>;
-export interface ExtractedMemory {
-    content: string;
-    expiresAtMs: number | null;
-    target: MemoryTarget;
-}
+export type ExtractedMemory = z.output<typeof extractedMemoryResultSchema>;
 export interface MemoryAgent {
     extractSessionMemories(request: ExtractSessionRequest): Promise<ExtractedMemory[]> | ExtractedMemory[];
     reviewCreateRequest(request: CreateMemoryRequest): Promise<MemoryReview> | MemoryReview;
 }
 /** Create the memory-owned agent that reviews and extracts memory candidates. */
 export declare function createMemoryAgent(model: PluginModel): MemoryAgent;
+/** Parse the canonical extracted-memory shape stored across task retries. */
+export declare function parseExtractedMemory(memory: unknown): ExtractedMemory;
 /** Parse the structured decision returned by the memory agent. */
 export declare function parseMemoryReview(result: unknown): MemoryReview;
 /** Parse the structured input sent to the memory agent. */

package/dist/db/schema.d.ts

@@ -53,19 +53,19 @@ export declare const juniorMemoryMemories: import("drizzle-orm/pg-core").PgTable
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
-        type: import("drizzle-orm/pg-core").PgColumn<{
+        kind: import("drizzle-orm/pg-core").PgColumn<{
             name: "type";
             tableName: "junior_memory_memories";
             dataType: "string";
             columnType: "PgText";
-            data: "preference" | "identity" | "relationship" | "knowledge" | "context" | "event" | "task" | "observation";
+            data: "preference" | "procedure" | "knowledge";
             driverParam: string;
             notNull: true;
             hasDefault: false;
             isPrimaryKey: false;
             isAutoincrement: false;
             hasRuntimeDefault: false;
-            enumValues: ["preference", "identity", "relationship", "knowledge", "context", "event", "task", "observation"];
+            enumValues: ["preference", "procedure", "knowledge"];
             baseColumn: never;
             identity: undefined;
             generated: undefined;

package/dist/index.d.ts

@@ -2,4 +2,5 @@ export { createMemoryPlugin, memoryPlugin } from "./plugin";
 export type { MemoryPluginOptions } from "./plugin";
 export { createMemoryStore } from "./store";
 export type { ArchiveMemoryInput, CreateMemoryInput, CreateMemoryResult, ListMemoriesInput, MemoryDb, MemoryEmbeddingProvider, MemoryRecord, MemoryStore, MemoryStoreOptions, SearchMemoriesInput, } from "./store";
-export type { MemoryRuntimeContext } from "./types";
+export { MEMORY_KINDS } from "./types";
+export type { MemoryKind, MemoryRuntimeContext } from "./types";

package/dist/index.js

@@ -12,16 +12,7 @@ import {
   slackSourceSchema
 } from "@sentry/junior-plugin-api";
 import { z } from "zod";
-var MEMORY_TYPES = [
-  "preference",
-  "identity",
-  "relationship",
-  "knowledge",
-  "context",
-  "event",
-  "task",
-  "observation"
-];
+var MEMORY_KINDS = ["preference", "procedure", "knowledge"];
 var MEMORY_SCOPES = ["personal", "conversation"];
 var MEMORY_SUBJECT_TYPES = [
   "user",
@@ -51,8 +42,7 @@ var memoryRuntimeContextSchema = z.union([
 ]);
 
 // src/agent.ts
-var memoryTargetSchema = z2.enum(["requester", "conversation"]);
-var memoryKindSchema = z2.enum(["preference", "procedure", "fact"]);
+var memoryKindSchema = z2.enum(MEMORY_KINDS);
 var memoryRejectReasonSchema = z2.enum([
   "not_public_shareable",
   "secret_or_credential",
@@ -100,7 +90,7 @@ var expiresAtMsSchema = z2.number().finite().nullable().describe(
 var memoryReviewDecisionSchema = z2.discriminatedUnion("decision", [
   z2.object({
     decision: z2.literal("store"),
-    target: memoryTargetSchema,
+    kind: memoryKindSchema,
     content: z2.string().min(1),
     expiresAtMs: z2.number().finite().optional()
   }).strict(),
@@ -113,7 +103,7 @@ var memoryReviewResponseSchema = z2.discriminatedUnion("decision", [
   z2.object({
     decision: z2.literal("store"),
     kind: memoryKindSchema.describe(
-      "Use preference only for requester-owned personal preferences, opinions, habits, or workflows. Use procedure for reusable task or process instructions. Use fact for shared project, channel, operational, or runbook knowledge."
+      "Use preference only for requester-owned personal preferences, opinions, habits, or workflows. Use procedure for reusable task or process instructions. Use knowledge for shared project, channel, operational, or runbook facts."
     ),
     canonicalFact: z2.string().min(1).describe(
       "Stored memory text. It must be self-contained and must not include requester names, requester/user labels, source labels, or first- or second-person wording."
@@ -127,13 +117,18 @@ var memoryReviewResponseSchema = z2.discriminatedUnion("decision", [
 ]);
 var extractedMemorySchema = z2.object({
   kind: memoryKindSchema.describe(
-    "Use preference only for requester-owned personal preferences, opinions, habits, or workflows. Use procedure for reusable task or process instructions. Use fact for shared project, channel, operational, or runbook knowledge."
+    "Use preference only for requester-owned personal preferences, opinions, habits, or workflows. Use procedure for reusable task or process instructions. Use knowledge for shared project, channel, operational, or runbook facts."
   ),
   canonicalFact: z2.string().min(1).describe(
     "Stored memory text as one self-contained fact. It must not include requester names, requester/user labels, source labels, or first- or second-person wording."
   ),
   expiresAtMs: expiresAtMsSchema
 }).strict();
+var extractedMemoryResultSchema = z2.object({
+  content: z2.string().min(1),
+  expiresAtMs: expiresAtMsSchema,
+  kind: memoryKindSchema
+}).strict();
 var extractMemoriesResponseSchema = z2.object({
   memories: z2.array(extractedMemorySchema).max(5).describe(
     "Accepted public/shareable durable memories from the completed run. Return one object per distinct source assertion and classify it with kind."
@@ -162,12 +157,6 @@ var CANONICAL_CONTENT_RULES = [
   "- Drop perspective/provenance markers while preserving useful context.",
   "- Remove requester names, display names, requester/user labels, first- or second-person wording, thread labels, channel labels, and source labels."
 ];
-function targetForKind(kind) {
-  if (kind === "preference") {
-    return "requester";
-  }
-  return "conversation";
-}
 function escapeXml(value) {
   return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
 }
@@ -213,7 +202,7 @@ function memoryKindsContext() {
     "<memory-kinds>",
     "- preference: a durable first-person personal preference, opinion, habit, or workflow owned by the current requester. Stored as requester memory.",
     "- procedure: reusable instructions for how a task, lookup, investigation, process, triage flow, or runbook should be done. Store the method, source-of-truth, prerequisite, or decision path when it took effort to discover. Stored as conversation memory.",
-    "- fact: stable shared project, channel, operational, or runbook knowledge that is not a personal requester preference. Direct answers to user inquiries qualify only when they are durable beyond this run. Stored as conversation memory.",
+    "- knowledge: stable shared project, channel, operational, or runbook fact that is not a personal requester preference. Direct answers to user inquiries qualify only when they are durable beyond this run. Stored as conversation memory.",
     "</memory-kinds>"
   ].join("\n");
 }
@@ -232,14 +221,14 @@ function reviewPrompt(request) {
     "",
     "<rules>",
     "- Return store only when the candidate is public/shareable, durable, and self-contained.",
-    "- First classify the memory kind: preference, procedure, or fact.",
+    "- First classify the memory kind: preference, procedure, or knowledge.",
     "- Use kind=preference only for first-person facts authored by the current requester about their own preference, opinion, habit, identity, or workflow.",
     "- Reject named third-person personal facts such as another person's preference, opinion, habit, identity, relationship, or workflow. Do not assume a named person is the current requester.",
     "- Use kind=procedure for reusable task/process/runbook instructions.",
-    "- Use kind=fact for shared project, channel, operational, or runbook knowledge.",
+    "- Use kind=knowledge for shared project, channel, operational, or runbook facts.",
     "- When current-user-message contains an explicit memory request with a concrete fact or procedure, extract from current-user-message even if the candidate is vague, incomplete, or phrased as an instruction.",
     "- A candidate may be badly phrased by an outer assistant or extraction pass. When current-user-message contains the requester's own first-person memory fact, treat that as requester-authored source evidence and canonicalize the fact instead of rejecting for third-person wording.",
-    "- When candidate wording personalizes a shared task, process, runbook, project, channel, or operational fact, use current-user-message to recover the shared fact and classify it as procedure or fact.",
+    "- When candidate wording personalizes a shared task, process, runbook, project, channel, or operational fact, use current-user-message to recover the shared fact and classify it as procedure or knowledge.",
     "- Explicit procedure requests are valid when the source text contains both task context and action. Canonicalize them as shared procedure facts instead of rejecting them as vague.",
     "- Store content as person-less, source-less canonical knowledge. Ownership and source live in structured metadata, not prose.",
     "- For requester memories, omit the subject and write the content as a stable fact such as 'Prefers X', 'Uses Y', or 'Thinks Z'.",
@@ -300,7 +289,7 @@ function sessionExtractionPrompt(request) {
     "- Do not store the fact that the user asked for advice, search, recall, planning, listing, inspection, or removal. Store only stable knowledge discovered in response, such as a reusable method or source-of-truth.",
     "- A user question asking how, what, where, or whether to do something is not source evidence for the answer. Store the answer only when supported by a user-authored factual statement or a tool result.",
     "- Set kind=procedure for reusable task/process/runbook instructions.",
-    "- Set kind=fact for shared team, project, channel, runbook, or operational knowledge.",
+    "- Set kind=knowledge for shared team, project, channel, runbook, or operational facts.",
     "- Set kind=preference only for clear durable first-person facts authored by the current requester about their own preference, opinion, habit, identity, or workflow.",
     "- Reject named third-person personal facts such as another person's preference, opinion, habit, identity, relationship, or workflow. Do not assume a named person is the current requester.",
     "- User-authored task instructions are procedures, not preferences, unless they explicitly describe the requester's personal preference or habit.",
@@ -344,7 +333,7 @@ function memoryReviewFromResponse(response) {
   if (response.decision === "store") {
     return parseMemoryReview({
       decision: "store",
-      target: targetForKind(response.kind),
+      kind: response.kind,
       content: response.canonicalFact,
       ...response.expiresAtMs !== null ? { expiresAtMs: response.expiresAtMs } : {}
     });
@@ -355,13 +344,16 @@ function memoryReviewFromResponse(response) {
   });
 }
 function extractedMemoriesFromResponse(response) {
-  const toMemory = (memory) => ({
+  const toMemory = (memory) => parseExtractedMemory({
     content: memory.canonicalFact,
     expiresAtMs: memory.expiresAtMs,
-    target: targetForKind(memory.kind)
+    kind: memory.kind
   });
   return response.memories.map(toMemory);
 }
+function parseExtractedMemory(memory) {
+  return extractedMemoryResultSchema.parse(memory);
+}
 function parseMemoryReview(result) {
   return memoryReviewDecisionSchema.parse(result);
 }
@@ -391,7 +383,7 @@ var juniorMemoryMemories = pgTable(
     id: text("id").primaryKey(),
     scope: text("scope", { enum: MEMORY_SCOPES }).notNull(),
     scopeKey: text("scope_key").notNull(),
-    type: text("type", { enum: MEMORY_TYPES }).notNull(),
+    kind: text("type", { enum: MEMORY_KINDS }).notNull(),
     subjectType: text("subject_type", { enum: MEMORY_SUBJECT_TYPES }).notNull(),
     subjectKey: text("subject_key"),
     content: text("content").notNull(),
@@ -423,16 +415,11 @@ var juniorMemoryMemories = pgTable(
       sql`${table.scope} IN ('personal', 'conversation')`
     ),
     check(
-      "junior_memory_memories_type_check",
-      sql`${table.type} IN (
+      "junior_memory_memories_kind_check",
+      sql`${table.kind} IN (
         'preference',
-        'identity',
-        'relationship',
-        'knowledge',
-        'context',
-        'event',
-        'task',
-        'observation'
+        'procedure',
+        'knowledge'
       )`
     ),
     check(
@@ -492,7 +479,7 @@ function formatMemory(row, args) {
     `scope_key=${row.scopeKey}`,
     `subject_type=${row.subjectType}`,
     ...row.subjectKey ? [`subject_key=${row.subjectKey}`] : [],
-    `type=${row.type}`,
+    `kind=${row.kind}`,
     `created_at=${formatDate(row.createdAtMs)}`,
     `observed_at=${formatDate(row.observedAtMs)}`,
     `expires_at=${formatDate(row.expiresAtMs)}`,
@@ -623,8 +610,10 @@ import {
   eq as eq3,
   gt as gt2,
   ilike as ilike2,
+  inArray,
   isNull as isNull2,
   like,
+  lte,
   or as or2,
   sql as sql2
 } from "drizzle-orm";
@@ -702,6 +691,7 @@ function deriveVisibleMemoryScopes(ctx) {
 // src/store.ts
 var DEFAULT_LIST_LIMIT = 50;
 var DEFAULT_SEARCH_LIMIT = 10;
+var DEFAULT_EXPIRED_ARCHIVE_LIMIT = 100;
 var VECTOR_SEARCH_OVERFETCH = 4;
 var MAX_MEMORY_CONTENT_CHARS = 4e3;
 var EMBEDDING_METRIC = "cosine";
@@ -713,7 +703,8 @@ var numberSchema = z3.number().finite();
 var createMemoryInputSchema = z3.object({
   content: memoryContentSchema,
   expiresAtMs: numberSchema.optional(),
-  idempotencyKey: nonEmptyStringSchema2
+  idempotencyKey: nonEmptyStringSchema2,
+  kind: z3.enum(MEMORY_KINDS)
 }).strict();
 var listMemoriesInputSchema = z3.object({
   limit: numberSchema.optional()
@@ -726,6 +717,9 @@ var archiveMemoryInputSchema = z3.object({
   id: nonEmptyStringSchema2,
   reason: nonEmptyStringSchema2.optional()
 }).strict();
+var archiveExpiredMemoriesInputSchema = z3.object({
+  limit: numberSchema.optional()
+}).strict();
 var clockSchema = z3.function({ input: [], output: numberSchema }).optional();
 var memoryStoreOptionsSchema = z3.object({
   now: clockSchema
@@ -759,7 +753,7 @@ var memoryRowSchema = z3.object({
   subjectType: z3.enum(MEMORY_SUBJECT_TYPES),
   supersededAtMs: optionalNumberSchema,
   supersededById: optionalStringSchema,
-  type: z3.enum(MEMORY_TYPES)
+  kind: z3.enum(MEMORY_KINDS)
 }).strict().superRefine((row, ctx) => {
   if (row.subjectType === "general") {
     if (row.subjectKey !== void 0) {
@@ -791,7 +785,7 @@ var memoryRecordSchema = z3.object({
   subjectType: z3.enum(MEMORY_SUBJECT_TYPES),
   supersededAtMs: numberSchema.optional(),
   supersededById: nonEmptyStringSchema2.optional(),
-  type: z3.enum(MEMORY_TYPES)
+  kind: z3.enum(MEMORY_KINDS)
 }).strict();
 var embeddingVectorSchema = z3.array(numberSchema).length(MEMORY_EMBEDDING_DIMENSIONS);
 var embeddingResultSchema = z3.object({
@@ -829,7 +823,7 @@ function parseMemoryRow(row) {
   return memoryRecordSchema.parse({
     id: parsed.id,
     scope: parsed.scope,
-    type: parsed.type,
+    kind: parsed.kind,
     subjectType: parsed.subjectType,
     content: parsed.content,
     observedAtMs: parsed.observedAtMs,
@@ -878,11 +872,53 @@ async function findByIdempotencyKey(args) {
       eq3(juniorMemoryMemories.idempotencyKey, args.idempotencyKey),
       isNull2(juniorMemoryMemories.archivedAtMs),
       isNull2(juniorMemoryMemories.supersededAtMs),
-      isNull2(juniorMemoryMemories.supersededById)
+      isNull2(juniorMemoryMemories.supersededById),
+      or2(
+        isNull2(juniorMemoryMemories.expiresAtMs),
+        gt2(juniorMemoryMemories.expiresAtMs, args.nowMs)
+      )
     )
   ).limit(1);
   return rows[0] ? parseMemoryRow(rows[0]) : void 0;
 }
+async function archiveExpiredMemoryBatch(args) {
+  const scopePredicate = visibleScopePredicate(args.scopes);
+  if (!scopePredicate) {
+    return { archivedCount: 0 };
+  }
+  const predicates = [
+    scopePredicate,
+    isNull2(juniorMemoryMemories.archivedAtMs),
+    isNull2(juniorMemoryMemories.supersededAtMs),
+    isNull2(juniorMemoryMemories.supersededById),
+    lte(juniorMemoryMemories.expiresAtMs, args.nowMs)
+  ];
+  if (args.idempotencyKey !== void 0) {
+    predicates.push(
+      eq3(juniorMemoryMemories.idempotencyKey, args.idempotencyKey)
+    );
+  }
+  const archivedIds = await args.db.transaction(async (tx) => {
+    const expired = await tx.select({ id: juniorMemoryMemories.id }).from(juniorMemoryMemories).where(and2(...predicates)).orderBy(
+      asc(juniorMemoryMemories.expiresAtMs),
+      asc(juniorMemoryMemories.id)
+    ).limit(boundedLimit(args.limit, DEFAULT_EXPIRED_ARCHIVE_LIMIT));
+    const ids = expired.map((row) => row.id);
+    if (ids.length === 0) {
+      return [];
+    }
+    const archived = await tx.update(juniorMemoryMemories).set({
+      archivedAtMs: args.nowMs,
+      archiveReason: "expired"
+    }).where(and2(inArray(juniorMemoryMemories.id, ids), ...predicates)).returning({ id: juniorMemoryMemories.id });
+    const idsToClean = archived.map((row) => row.id);
+    if (idsToClean.length > 0) {
+      await tx.delete(juniorMemoryEmbeddings).where(inArray(juniorMemoryEmbeddings.memoryId, idsToClean));
+    }
+    return idsToClean;
+  });
+  return { archivedCount: archivedIds.length };
+}
 function searchScore(memory, terms) {
   const haystack = memory.content.toLowerCase();
   return terms.reduce(
@@ -1053,6 +1089,15 @@ function createMemoryStore(db, context, options = {}) {
   const parsedOptions = memoryStoreOptionsSchema.parse({ now: options.now });
   const embedder = options.embedder;
   const getNowMs = parsedOptions.now ?? Date.now;
+  async function archiveExpiredVisibleMemories(input, nowMs) {
+    input = archiveExpiredMemoriesInputSchema.parse(input ?? {});
+    return await archiveExpiredMemoryBatch({
+      db,
+      limit: input.limit,
+      nowMs,
+      scopes: deriveVisibleMemoryScopes(runtimeContext)
+    });
+  }
   async function createScopedMemory(rawInput, scopeKind) {
     const input = createMemoryInputSchema.parse(rawInput);
     const nowMs = getNowMs();
@@ -1062,6 +1107,18 @@ function createMemoryStore(db, context, options = {}) {
     if (content.length > MAX_MEMORY_CONTENT_CHARS) {
       throw new Error("Memory content exceeds the maximum length.");
     }
+    await archiveExpiredMemoryBatch({
+      db,
+      nowMs,
+      scopes: [scope]
+    });
+    await archiveExpiredMemoryBatch({
+      db,
+      idempotencyKey: input.idempotencyKey,
+      limit: 1,
+      nowMs,
+      scopes: [scope]
+    });
     const id = randomUUID();
     const rows = await db.insert(juniorMemoryMemories).values({
       content,
@@ -1076,7 +1133,7 @@ function createMemoryStore(db, context, options = {}) {
       sourcePlatform: runtimeContext.source.platform,
       subjectKey: subject.subjectKey,
       subjectType: subject.subjectType,
-      type: "knowledge"
+      kind: input.kind
     }).onConflictDoNothing({
       target: [
         juniorMemoryMemories.scope,
@@ -1099,6 +1156,7 @@ function createMemoryStore(db, context, options = {}) {
     const idempotent = await findByIdempotencyKey({
       db,
       idempotencyKey: input.idempotencyKey,
+      nowMs,
       scope
     });
     if (!idempotent) {
@@ -1114,6 +1172,9 @@ function createMemoryStore(db, context, options = {}) {
     return { created: false, memory: idempotent };
   }
   return {
+    async archiveExpiredMemories(input) {
+      return await archiveExpiredVisibleMemories(input, getNowMs());
+    },
     async createMemory(input) {
       return await createScopedMemory(input, "personal");
     },
@@ -1124,6 +1185,11 @@ function createMemoryStore(db, context, options = {}) {
       input = listMemoriesInputSchema.parse(input);
       const nowMs = getNowMs();
       const scopes = deriveVisibleMemoryScopes(runtimeContext);
+      await archiveExpiredMemoryBatch({
+        db,
+        nowMs,
+        scopes
+      });
       return await listVisibleMemories({
         db,
         limit: input.limit,
@@ -1135,6 +1201,11 @@ function createMemoryStore(db, context, options = {}) {
       input = searchMemoriesInputSchema.parse(input);
       const nowMs = getNowMs();
       const scopes = deriveVisibleMemoryScopes(runtimeContext);
+      await archiveExpiredMemoryBatch({
+        db,
+        nowMs,
+        scopes
+      });
       const limit = boundedLimit(input.limit, DEFAULT_SEARCH_LIMIT);
       const vectorCandidates = await searchVisibleVectorMemories({
         db,
@@ -1394,9 +1465,16 @@ function createInput(context, input, toolCallId) {
   return {
     content: requireMemoryContent(input.content),
     idempotencyKey: `tool:${sourceIdempotencyKey(context)}:${toolCallId}`,
+    kind: input.kind,
     ...input.expiresAtMs !== void 0 ? { expiresAtMs: input.expiresAtMs } : {}
   };
 }
+function targetForKind(kind) {
+  if (kind === "preference") {
+    return "requester";
+  }
+  return "conversation";
+}
 function compactMemory(memory) {
   return {
     id: memory.id,
@@ -1407,7 +1485,7 @@ function compactMemory(memory) {
 }
 function createMemoryCreateTool(context) {
   return {
-    description: "Explicit memory-write tool. Use only when the latest user message directly asks Junior to remember, store, save, or forget-and-replace a public/shareable fact. Do not use for ordinary statements like 'I prefer X', 'I use Y', or 'X goes before Y' unless the user also asks you to remember/store/save it; passive memory learning handles those after the visible reply. Pass one self-contained natural-language candidate preserving the user's explicit memory intent. Do not ask the user to rephrase ordinary first-person facts, and do not rewrite them into display-name or third-person wording. Do not include secrets, private personal details, medical/legal/financial/sensitive facts, or another person's personal preference, opinion, habit, identity, relationship, workflow, or private life. Runtime context derives actor, scope, source, and subject ids; the memory agent decides the canonical stored content, subject, and target.",
+    description: "Explicit memory-write tool. Use only when the latest user message directly asks Junior to remember, store, save, or forget-and-replace a public/shareable fact. Do not use for ordinary statements like 'I prefer X', 'I use Y', or 'X goes before Y' unless the user also asks you to remember/store/save it; passive memory learning handles those after the visible reply. Pass one self-contained natural-language candidate preserving the user's explicit memory intent. Do not ask the user to rephrase ordinary first-person facts, and do not rewrite them into display-name or third-person wording. Do not include secrets, private personal details, medical/legal/financial/sensitive facts, or another person's personal preference, opinion, habit, identity, relationship, workflow, or private life. Runtime context derives actor, scope, source, and subject ids; the memory agent decides canonical stored content and memory kind, then the plugin derives storage target from kind.",
     executionMode: "sequential",
     inputSchema: createMemoryInputSchema2,
     execute: async (input, options) => {
@@ -1455,13 +1533,14 @@ function createMemoryCreateTool(context) {
         context,
         {
           content: review.content,
+          kind: review.kind,
           ...review.expiresAtMs !== void 0 ? { expiresAtMs: review.expiresAtMs } : requestedExpiresAtMs !== void 0 ? { expiresAtMs: requestedExpiresAtMs } : {}
         },
         toolCallId
       );
       const result = await (async () => {
         try {
-          if (review.target === "conversation") {
+          if (targetForKind(review.kind) === "conversation") {
             return await store.createConversationMemory(memoryInput);
           }
           return await store.createMemory(memoryInput);
@@ -1564,16 +1643,23 @@ var extractedMemoryCacheSchema = z4.array(
   z4.object({
     content: z4.string().min(1),
     expiresAtMs: z4.number().finite().nullable(),
-    target: z4.enum(["requester", "conversation"])
-  }).strict()
+    kind: z4.enum(MEMORY_KINDS)
+  }).strict().transform(parseExtractedMemory)
 );
+function targetForKind2(kind) {
+  if (kind === "preference") {
+    return "requester";
+  }
+  return "conversation";
+}
 function memoryIdempotencySuffix(memory) {
-  return createHash2("sha256").update(memory.target).update("\0").update(memory.content).update("\0").update(memory.expiresAtMs === null ? "never" : String(memory.expiresAtMs)).digest("hex").slice(0, 32);
+  return createHash2("sha256").update(targetForKind2(memory.kind)).update("\0").update(memory.kind).update("\0").update(memory.content).update("\0").update(memory.expiresAtMs === null ? "never" : String(memory.expiresAtMs)).digest("hex").slice(0, 32);
 }
 function passiveInput(sessionId, memory, sourceKey2) {
   return {
     content: memory.content,
     idempotencyKey: `session:${sourceKey2}:${sessionId}:${memoryIdempotencySuffix(memory)}`,
+    kind: memory.kind,
     ...memory.expiresAtMs !== null ? { expiresAtMs: memory.expiresAtMs } : {}
   };
 }
@@ -1616,6 +1702,7 @@ async function processMemorySession(context) {
   const store = createMemoryStore(context.db, runtimeContext, {
     embedder: context.embedder
   });
+  await store.archiveExpiredMemories();
   const memories = await getTaskMemories(context, async () => {
     const existingMemories = await store.searchMemories({
       limit: 10,
@@ -1635,7 +1722,7 @@ async function processMemorySession(context) {
   }
   for (const memory of memories) {
     const input = passiveInput(run.runId, memory, sourceKey2);
-    if (memory.target === "conversation") {
+    if (targetForKind2(memory.kind) === "conversation") {
       await store.createConversationMemory(input);
       continue;
     }
@@ -1770,6 +1857,7 @@ function createMemoryPlugin(options = {}) {
 }
 var memoryPlugin = createMemoryPlugin();
 export {
+  MEMORY_KINDS,
   createMemoryPlugin,
   createMemoryStore,
   memoryPlugin