memorix 1.1.7 → 1.1.9

package/src/cli/commands/retention.ts

@@ -1,108 +1,108 @@
-import { defineCommand } from 'citty';
-import { getAllObservations } from '../../memory/observations.js';
-import { archiveExpired, explainRetention, getArchiveCandidates, getRetentionSummary, getRetentionZone, rankByRelevance } from '../../memory/retention.js';
-import type { MemorixDocument } from '../../types.js';
-import { emitError, emitResult, getCliProjectContext } from './operator-shared.js';
-
-function toDocument(obs: Awaited<ReturnType<typeof getAllObservations>>[number]): MemorixDocument {
-  return {
-    id: `obs-${obs.id}`,
-    observationId: obs.id,
-    entityName: obs.entityName,
-    type: obs.type,
-    title: obs.title,
-    narrative: obs.narrative,
-    facts: obs.facts.join('\n'),
-    filesModified: obs.filesModified.join('\n'),
-    concepts: obs.concepts.join(', '),
-    tokens: obs.tokens,
-    createdAt: obs.createdAt,
-    projectId: obs.projectId,
-    accessCount: 0,
-    lastAccessedAt: '',
-    status: obs.status ?? 'active',
-    source: obs.source ?? 'agent',
-    sourceDetail: obs.sourceDetail ?? '',
-    valueCategory: obs.valueCategory ?? '',
-  };
-}
-
-export default defineCommand({
-  meta: {
-    name: 'retention',
-    description: 'Inspect retention state and archive expired memories',
-  },
-  args: {
-    json: { type: 'boolean', description: 'Emit machine-readable JSON output' },
-  },
-  run: async ({ args }) => {
-    const action = (args._ as string[])?.[0] || '';
-    const asJson = !!args.json;
-
-    try {
-      const { project, dataDir } = await getCliProjectContext();
-      const activeDocs = getAllObservations()
-        .filter((obs) => obs.projectId === project.id && (obs.status ?? 'active') === 'active')
-        .map(toDocument);
-
-      switch (action) {
-        case 'status': {
-          const summary = getRetentionSummary(activeDocs);
-          const archiveCandidates = getArchiveCandidates(activeDocs);
-          const ranked = rankByRelevance(activeDocs).slice(0, 5);
-          emitResult(
-            { project, summary, archiveCandidates, ranked },
-            [
-              `Retention status for ${project.name}`,
-              `- Active: ${summary.active}`,
-              `- Stale: ${summary.stale}`,
-              `- Archive candidates: ${summary.archiveCandidates}`,
-              `- Immune: ${summary.immune}`,
-            ].join('\n'),
-            asJson,
-          );
-          return;
-        }
-
-        case 'archive': {
-          const result = await archiveExpired(dataDir);
-          emitResult(
-            { project, result },
-            result.archived === 0
-              ? 'No expired observations to archive.'
-              : `Archived ${result.archived} expired observation(s); ${result.remaining} active observation(s) remain.`,
-            asJson,
-          );
-          return;
-        }
-
-        case 'stale': {
-          const stale = activeDocs
-            .filter((doc) => getRetentionZone(doc) !== 'active')
-            .map((doc) => explainRetention(doc));
-          emitResult(
-            { project, stale },
-            stale.length === 0
-              ? 'No stale or archive-candidate observations.'
-              : stale
-                  .map((entry) => `- #${entry.observationId}: ${entry.summary}`)
-                  .join('\n'),
-            asJson,
-          );
-          return;
-        }
-
-        default:
-          console.log('Memorix Retention Commands');
-          console.log('');
-          console.log('Usage:');
-          console.log('  memorix retention status');
-          console.log('  memorix retention stale');
-          console.log('  memorix retention archive');
-      }
-    } catch (error) {
-      emitError(error instanceof Error ? error.message : String(error), asJson);
-    }
-  },
-});
-
+import { defineCommand } from 'citty';
+import { getAllObservations } from '../../memory/observations.js';
+import { archiveExpired, explainRetention, getArchiveCandidates, getRetentionSummary, getRetentionZone, rankByRelevance } from '../../memory/retention.js';
+import type { MemorixDocument } from '../../types.js';
+import { emitError, emitResult, getCliProjectContext } from './operator-shared.js';
+
+function toDocument(obs: Awaited<ReturnType<typeof getAllObservations>>[number]): MemorixDocument {
+  return {
+    id: `obs-${obs.id}`,
+    observationId: obs.id,
+    entityName: obs.entityName,
+    type: obs.type,
+    title: obs.title,
+    narrative: obs.narrative,
+    facts: obs.facts.join('\n'),
+    filesModified: obs.filesModified.join('\n'),
+    concepts: obs.concepts.join(', '),
+    tokens: obs.tokens,
+    createdAt: obs.createdAt,
+    projectId: obs.projectId,
+    accessCount: 0,
+    lastAccessedAt: '',
+    status: obs.status ?? 'active',
+    source: obs.source ?? 'agent',
+    sourceDetail: obs.sourceDetail ?? '',
+    valueCategory: obs.valueCategory ?? '',
+  };
+}
+
+export default defineCommand({
+  meta: {
+    name: 'retention',
+    description: 'Inspect retention state and archive expired memories',
+  },
+  args: {
+    json: { type: 'boolean', description: 'Emit machine-readable JSON output' },
+  },
+  run: async ({ args }) => {
+    const action = (args._ as string[])?.[0] || '';
+    const asJson = !!args.json;
+
+    try {
+      const { project, dataDir } = await getCliProjectContext();
+      const activeDocs = getAllObservations()
+        .filter((obs) => obs.projectId === project.id && (obs.status ?? 'active') === 'active')
+        .map(toDocument);
+
+      switch (action) {
+        case 'status': {
+          const summary = getRetentionSummary(activeDocs);
+          const archiveCandidates = getArchiveCandidates(activeDocs);
+          const ranked = rankByRelevance(activeDocs).slice(0, 5);
+          emitResult(
+            { project, summary, archiveCandidates, ranked },
+            [
+              `Retention status for ${project.name}`,
+              `- Active: ${summary.active}`,
+              `- Stale: ${summary.stale}`,
+              `- Archive candidates: ${summary.archiveCandidates}`,
+              `- Immune: ${summary.immune}`,
+            ].join('\n'),
+            asJson,
+          );
+          return;
+        }
+
+        case 'archive': {
+          const result = await archiveExpired(dataDir);
+          emitResult(
+            { project, result },
+            result.archived === 0
+              ? 'No expired observations to archive.'
+              : `Archived ${result.archived} expired observation(s); ${result.remaining} active observation(s) remain.`,
+            asJson,
+          );
+          return;
+        }
+
+        case 'stale': {
+          const stale = activeDocs
+            .filter((doc) => getRetentionZone(doc) !== 'active')
+            .map((doc) => explainRetention(doc));
+          emitResult(
+            { project, stale },
+            stale.length === 0
+              ? 'No stale or archive-candidate observations.'
+              : stale
+                  .map((entry) => `- #${entry.observationId}: ${entry.summary}`)
+                  .join('\n'),
+            asJson,
+          );
+          return;
+        }
+
+        default:
+          console.log('Memorix Retention Commands');
+          console.log('');
+          console.log('Usage:');
+          console.log('  memorix retention status');
+          console.log('  memorix retention stale');
+          console.log('  memorix retention archive');
+      }
+    } catch (error) {
+      emitError(error instanceof Error ? error.message : String(error), asJson);
+    }
+  },
+});
+

package/src/cli/commands/serve-shared.ts

@@ -1,118 +1,118 @@
-import type { ProjectInfo } from '../../types.js';
-
-export interface ResolveServeProjectOptions {
-  cwdArg?: string;
-  envProjectRoot?: string;
-  initCwd?: string;
-  processCwd: string;
-  homeDir: string;
-  lastKnownProjectRoot?: string;
-}
-
-export interface ResolveServeProjectDeps {
-  detectProject: (cwd: string) => ProjectInfo | null;
-  findGitInSubdirs: (dir: string) => string | null;
-  isSystemDirectory: (dir: string) => boolean;
-}
-
-export interface ServeProjectResolution {
-  projectRoot: string;
-  detectedProject: ProjectInfo | null;
-  source: 'direct' | 'subdir' | 'last-known' | 'home' | 'home-subdir' | 'unresolved';
-  messages: string[];
-  error?: string;
-}
-
-export function resolveServeProject(
-  options: ResolveServeProjectOptions,
-  deps: ResolveServeProjectDeps,
-): ServeProjectResolution {
-  let projectRoot =
-    options.cwdArg ||
-    options.envProjectRoot ||
-    options.initCwd ||
-    options.processCwd;
-
-  const messages: string[] = [`[memorix] Starting with cwd: ${projectRoot}`];
-
-  let detected = deps.detectProject(projectRoot);
-  if (detected) {
-    return {
-      projectRoot,
-      detectedProject: detected,
-      source: 'direct',
-      messages,
-    };
-  }
-
-  const subGit = deps.findGitInSubdirs(projectRoot);
-  if (subGit) {
-    projectRoot = subGit;
-    detected = deps.detectProject(subGit);
-    if (detected) {
-      messages.push(`[memorix] Found .git in subdirectory: ${subGit}`);
-      return {
-        projectRoot,
-        detectedProject: detected,
-        source: 'subdir',
-        messages,
-      };
-    }
-  }
-
-  if (deps.isSystemDirectory(projectRoot)) {
-    messages.push(`[memorix] System directory detected: ${projectRoot}`);
-    messages.push('[memorix] Your IDE launched memorix from a non-workspace directory.');
-    messages.push('[memorix] Fix: add --cwd to your MCP config, or use an IDE/client that exposes workspace roots.');
-
-    if (options.lastKnownProjectRoot) {
-      detected = deps.detectProject(options.lastKnownProjectRoot);
-      if (detected) {
-        messages.push(`[memorix] Restored last known project: ${options.lastKnownProjectRoot}`);
-        return {
-          projectRoot: options.lastKnownProjectRoot,
-          detectedProject: detected,
-          source: 'last-known',
-          messages,
-        };
-      }
-    }
-
-    detected = deps.detectProject(options.homeDir);
-    if (detected) {
-      messages.push(`[memorix] Restored project from home directory: ${options.homeDir}`);
-      return {
-        projectRoot: options.homeDir,
-        detectedProject: detected,
-        source: 'home',
-        messages,
-      };
-    }
-
-    const homeSubGit = deps.findGitInSubdirs(options.homeDir);
-    if (homeSubGit) {
-      detected = deps.detectProject(homeSubGit);
-      if (detected) {
-        messages.push(`[memorix] Found .git in home subdirectory: ${homeSubGit}`);
-        return {
-          projectRoot: homeSubGit,
-          detectedProject: detected,
-          source: 'home-subdir',
-          messages,
-        };
-      }
-    }
-  }
-
-  messages.push('[memorix] Unable to establish a reliable git-backed project context.');
-  messages.push('[memorix] Memorix now refuses to silently fall back to untracked/* in stdio mode.');
-
-  return {
-    projectRoot,
-    detectedProject: null,
-    source: 'unresolved',
-    messages,
-    error:
-      'No git project could be resolved from the current workspace. Open the repo root, pass --cwd, or use an MCP client that sends workspace roots.',
-  };
-}
+import type { ProjectInfo } from '../../types.js';
+
+export interface ResolveServeProjectOptions {
+  cwdArg?: string;
+  envProjectRoot?: string;
+  initCwd?: string;
+  processCwd: string;
+  homeDir: string;
+  lastKnownProjectRoot?: string;
+}
+
+export interface ResolveServeProjectDeps {
+  detectProject: (cwd: string) => ProjectInfo | null;
+  findGitInSubdirs: (dir: string) => string | null;
+  isSystemDirectory: (dir: string) => boolean;
+}
+
+export interface ServeProjectResolution {
+  projectRoot: string;
+  detectedProject: ProjectInfo | null;
+  source: 'direct' | 'subdir' | 'last-known' | 'home' | 'home-subdir' | 'unresolved';
+  messages: string[];
+  error?: string;
+}
+
+export function resolveServeProject(
+  options: ResolveServeProjectOptions,
+  deps: ResolveServeProjectDeps,
+): ServeProjectResolution {
+  let projectRoot =
+    options.cwdArg ||
+    options.envProjectRoot ||
+    options.initCwd ||
+    options.processCwd;
+
+  const messages: string[] = [`[memorix] Starting with cwd: ${projectRoot}`];
+
+  let detected = deps.detectProject(projectRoot);
+  if (detected) {
+    return {
+      projectRoot,
+      detectedProject: detected,
+      source: 'direct',
+      messages,
+    };
+  }
+
+  const subGit = deps.findGitInSubdirs(projectRoot);
+  if (subGit) {
+    projectRoot = subGit;
+    detected = deps.detectProject(subGit);
+    if (detected) {
+      messages.push(`[memorix] Found .git in subdirectory: ${subGit}`);
+      return {
+        projectRoot,
+        detectedProject: detected,
+        source: 'subdir',
+        messages,
+      };
+    }
+  }
+
+  if (deps.isSystemDirectory(projectRoot)) {
+    messages.push(`[memorix] System directory detected: ${projectRoot}`);
+    messages.push('[memorix] Your IDE launched memorix from a non-workspace directory.');
+    messages.push('[memorix] Fix: add --cwd to your MCP config, or use an IDE/client that exposes workspace roots.');
+
+    if (options.lastKnownProjectRoot) {
+      detected = deps.detectProject(options.lastKnownProjectRoot);
+      if (detected) {
+        messages.push(`[memorix] Restored last known project: ${options.lastKnownProjectRoot}`);
+        return {
+          projectRoot: options.lastKnownProjectRoot,
+          detectedProject: detected,
+          source: 'last-known',
+          messages,
+        };
+      }
+    }
+
+    detected = deps.detectProject(options.homeDir);
+    if (detected) {
+      messages.push(`[memorix] Restored project from home directory: ${options.homeDir}`);
+      return {
+        projectRoot: options.homeDir,
+        detectedProject: detected,
+        source: 'home',
+        messages,
+      };
+    }
+
+    const homeSubGit = deps.findGitInSubdirs(options.homeDir);
+    if (homeSubGit) {
+      detected = deps.detectProject(homeSubGit);
+      if (detected) {
+        messages.push(`[memorix] Found .git in home subdirectory: ${homeSubGit}`);
+        return {
+          projectRoot: homeSubGit,
+          detectedProject: detected,
+          source: 'home-subdir',
+          messages,
+        };
+      }
+    }
+  }
+
+  messages.push('[memorix] Unable to establish a reliable git-backed project context.');
+  messages.push('[memorix] Memorix now refuses to silently fall back to untracked/* in stdio mode.');
+
+  return {
+    projectRoot,
+    detectedProject: null,
+    source: 'unresolved',
+    messages,
+    error:
+      'No git project could be resolved from the current workspace. Open the repo root, pass --cwd, or use an MCP client that sends workspace roots.',
+  };
+}

package/src/cli/commands/setup.ts

@@ -357,9 +357,9 @@ function relativePosix(from: string, to: string): string {
   return rel;
 }
 
-type McpConfigAgent = Exclude<AgentName, 'pi'>;
+export type McpConfigAgent = Exclude<AgentName, 'pi'>;
 
-function getMcpAdapter(agent: McpConfigAgent): MCPConfigAdapter {
+export function getMcpAdapter(agent: McpConfigAgent): MCPConfigAdapter {
   const adapters: Record<McpConfigAgent, MCPConfigAdapter> = {
     claude: new ClaudeCodeMCPAdapter(),
     codex: new CodexMCPAdapter(),
@@ -378,7 +378,7 @@ function getMcpAdapter(agent: McpConfigAgent): MCPConfigAdapter {
   return adapters[agent];
 }
 
-function buildMemorixServer(mcp: Exclude<SetupMcpTransport, 'none'>): MCPServerEntry {
+export function buildMemorixServer(mcp: Exclude<SetupMcpTransport, 'none'>): MCPServerEntry {
   if (mcp === 'http') {
     return {
       name: 'memorix',