hafez 1.0.1 → 1.0.2

package/dist/types.d.ts

@@ -80,7 +80,6 @@ export interface ParsedSessionLogEntry {
 }
 export interface UpdateFields {
     status?: EntityStatus;
-    next_action?: string | null;
     current_state?: string;
     session_log?: SessionLogEntry;
     brief?: string | null;
@@ -100,7 +99,6 @@ export interface UpdateFields {
     add_source?: string;
 }
 export interface UpdateResult {
-    previous_next_action?: string | null;
     matched_action?: string;
 }
 export interface CreateEntityFields {
@@ -261,7 +259,7 @@ export type BatchOperation = {
     slug: string;
     target: 'entity' | 'project' | 'knowledge';
 };
-export type HafezErrorCode = 'NOT_FOUND' | 'SLUG_EXISTS' | 'VALIDATION_FAILED' | 'GIT_PUSH_FAILED';
+export type HafezErrorCode = 'NOT_FOUND' | 'SLUG_EXISTS' | 'VALIDATION_FAILED' | 'GIT_PUSH_FAILED' | 'GIT_COMMIT_FAILED' | 'VAULT_LOCKED';
 export declare class HafezError extends Error {
     code: HafezErrorCode;
     details?: string[] | undefined;

package/dist/vault.js

@@ -3,17 +3,28 @@ import matter from 'gray-matter';
 import yaml from 'js-yaml';
 import { readFileSync, existsSync } from 'fs';
 import { join } from 'path';
+import { HafezError } from './types.js';
 // Prevent gray-matter from auto-coercing YAML date strings into JS Date objects
 const MATTER_OPTIONS = { engines: { yaml: (s) => yaml.load(s, { schema: yaml.JSON_SCHEMA }) } };
 export function slugify(name) {
+    // Unicode-aware: non-Latin letters/digits are kept, so "日本語のメモ" gets a
+    // real slug instead of collapsing to ''.
     return name
         .toLowerCase()
         .replace(/['']/g, '')
-        .replace(/[^a-z0-9]+/g, '-')
+        .replace(/[^\p{L}\p{N}]+/gu, '-')
         .replace(/^-|-$/g, '')
         .replace(/-{2,}/g, '-');
 }
+// Slugs are path components: anything with separators (or a leading dot, or a
+// Windows drive colon) could escape the vault — "../../outside/secret" reads,
+// writes, and deletes files anywhere on disk. Block only those; spaces and
+// non-Latin names are legitimate in a hand-edited (Obsidian) vault. Single
+// choke point for every slug-consuming operation.
 export function resolveFilePath(vaultPath, slug, kind) {
+    if (!slug || slug.startsWith('.') || /[/\\:\0]/.test(slug)) {
+        throw new HafezError('VALIDATION_FAILED', `Invalid slug: '${slug}'`);
+    }
     const dir = kind === 'entity' ? 'entities' : 'knowledge';
     return join(vaultPath, dir, `${slug}.md`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hafez",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,8 +17,9 @@
     "LICENSE"
   ],
   "scripts": {
-    "build": "tsc",
+    "build": "rm -rf dist && tsc",
     "install:local": "mkdir -p ~/.local/bin && ln -sf \"$(pwd)/dist/cli.js\" ~/.local/bin/hafez && rm -f ~/.claude/skills/hafez/SKILL.md && mkdir -p ~/.claude/skills/hafez && cp \"$(pwd)/skill/SKILL.md\" ~/.claude/skills/hafez/SKILL.md",
+    "pretest": "npm run build",
     "test": "vitest run",
     "test:watch": "vitest",
     "prepare": "npm run build"
@@ -27,11 +28,13 @@
     "better-sqlite3": "^12.6.2",
     "gray-matter": "^4.0.3",
     "js-yaml": "^4.1.1",
+    "proper-lockfile": "^4.1.2",
     "simple-git": "^3.33.0",
     "zod": "^4.3.6"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",
+    "@types/proper-lockfile": "^4.1.4",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^25.4.0",
     "tsx": "^4.21.0",

package/dist/migrate-knowledge-v2.d.ts

@@ -1,11 +0,0 @@
-export interface MigrationReport {
-    sessionsToMove: string[];
-    emptyToDelete: string[];
-    insightToRename: string[];
-    relatedToGenerate: string[];
-    gitignoreNeeded: boolean;
-    gitCommitFailed: boolean;
-}
-export declare function migrateKnowledgeV2(vaultPath: string, opts: {
-    apply: boolean;
-}): MigrationReport;

package/dist/migrate-knowledge-v2.js

@@ -1,158 +0,0 @@
-import { readdirSync, readFileSync, writeFileSync, existsSync, mkdirSync, renameSync, unlinkSync, appendFileSync } from 'fs';
-import { join } from 'path';
-import { parseFilePath, serializeFile } from './vault.js';
-import { syncRelatedSection, findSection } from './sections.js';
-import { generateVaultIndex } from './knowledge-index.js';
-import { spawnSync } from 'child_process';
-export function migrateKnowledgeV2(vaultPath, opts) {
-    const report = {
-        sessionsToMove: [],
-        emptyToDelete: [],
-        insightToRename: [],
-        relatedToGenerate: [],
-        gitignoreNeeded: false,
-        gitCommitFailed: false,
-    };
-    const knowledgeDir = join(vaultPath, 'knowledge');
-    const sessionsDir = join(vaultPath, 'sessions');
-    const entitiesDir = join(vaultPath, 'entities');
-    // Step 1: Find session knowledge notes (by frontmatter subtype, not filename)
-    if (existsSync(knowledgeDir)) {
-        for (const file of readdirSync(knowledgeDir).filter(f => f.endsWith('.md'))) {
-            try {
-                const { frontmatter } = parseFilePath(join(knowledgeDir, file));
-                if (frontmatter.subtype === 'session') {
-                    report.sessionsToMove.push(file);
-                }
-            }
-            catch {
-                continue;
-            }
-        }
-    }
-    // Step 2: Find empty-body knowledge notes
-    if (existsSync(knowledgeDir)) {
-        for (const file of readdirSync(knowledgeDir).filter(f => f.endsWith('.md'))) {
-            if (report.sessionsToMove.includes(file))
-                continue; // already moving
-            try {
-                const { body } = parseFilePath(join(knowledgeDir, file));
-                // "Empty" = body only has section headings (## ...) and whitespace
-                const stripped = body.replace(/^## .+$/gm, '').trim();
-                if (!stripped)
-                    report.emptyToDelete.push(file);
-            }
-            catch {
-                continue;
-            }
-        }
-    }
-    // Step 3: Find knowledge notes with ## Insight heading
-    if (existsSync(knowledgeDir)) {
-        for (const file of readdirSync(knowledgeDir).filter(f => f.endsWith('.md'))) {
-            if (report.sessionsToMove.includes(file) || report.emptyToDelete.includes(file))
-                continue;
-            try {
-                const { body } = parseFilePath(join(knowledgeDir, file));
-                if (findSection(body, 'Insight'))
-                    report.insightToRename.push(file);
-            }
-            catch {
-                continue;
-            }
-        }
-    }
-    // Step 4: Find files needing ## Related section generation
-    for (const [dir, kind] of [[entitiesDir, 'entity'], [knowledgeDir, 'knowledge']]) {
-        if (!existsSync(dir))
-            continue;
-        for (const file of readdirSync(dir).filter(f => f.endsWith('.md'))) {
-            if (kind === 'knowledge' && (report.sessionsToMove.includes(file) || report.emptyToDelete.includes(file)))
-                continue;
-            try {
-                const { frontmatter: fm, body } = parseFilePath(join(dir, file));
-                const hasLinks = (fm.related?.length > 0) || fm.parent;
-                if (hasLinks) {
-                    const synced = syncRelatedSection(body, fm);
-                    if (synced !== body)
-                        report.relatedToGenerate.push(`${kind === 'entity' ? 'entities' : 'knowledge'}/${file}`);
-                }
-            }
-            catch {
-                continue;
-            }
-        }
-    }
-    // Step 5: Check .gitignore
-    const gitignorePath = join(vaultPath, '.gitignore');
-    if (existsSync(gitignorePath)) {
-        const content = readFileSync(gitignorePath, 'utf-8');
-        if (!content.includes('/index.md'))
-            report.gitignoreNeeded = true;
-    }
-    else {
-        report.gitignoreNeeded = true;
-    }
-    if (!opts.apply)
-        return report;
-    // --- Apply ---
-    // Step 1: Move sessions
-    if (report.sessionsToMove.length > 0) {
-        mkdirSync(sessionsDir, { recursive: true });
-        for (const file of report.sessionsToMove) {
-            renameSync(join(knowledgeDir, file), join(sessionsDir, file));
-        }
-    }
-    // Step 2: Delete empty notes
-    for (const file of report.emptyToDelete) {
-        unlinkSync(join(knowledgeDir, file));
-    }
-    // Step 3: Rename ## Insight to ## Synthesis, add ## Sources if missing
-    for (const file of report.insightToRename) {
-        const filePath = join(knowledgeDir, file);
-        const content = readFileSync(filePath, 'utf-8');
-        let updated = content.replace(/^## Insight$/gm, '## Synthesis');
-        // Add ## Sources section if missing (new notes get it by default)
-        if (!findSection(updated, 'Sources')) {
-            updated = updated.trimEnd() + '\n\n## Sources\n';
-        }
-        writeFileSync(filePath, updated);
-    }
-    // Step 4: Generate ## Related sections
-    for (const relPath of report.relatedToGenerate) {
-        const filePath = join(vaultPath, relPath);
-        const { frontmatter: fm, body } = parseFilePath(filePath);
-        const newBody = syncRelatedSection(body, fm);
-        writeFileSync(filePath, serializeFile(fm, newBody));
-    }
-    // Step 5: Update .gitignore
-    if (report.gitignoreNeeded) {
-        appendFileSync(gitignorePath, '\n/index.md\n');
-    }
-    // Git commit only the files this migration touched
-    const filesToStage = [];
-    for (const f of report.sessionsToMove) {
-        filesToStage.push(`knowledge/${f}`); // deleted from knowledge/
-        filesToStage.push(`sessions/${f}`); // added to sessions/
-    }
-    for (const f of report.emptyToDelete)
-        filesToStage.push(`knowledge/${f}`);
-    for (const f of report.insightToRename)
-        filesToStage.push(`knowledge/${f}`);
-    for (const relPath of report.relatedToGenerate)
-        filesToStage.push(relPath);
-    if (report.gitignoreNeeded)
-        filesToStage.push('.gitignore');
-    if (filesToStage.length > 0) {
-        spawnSync('git', ['add', '--', ...filesToStage], { cwd: vaultPath, stdio: 'pipe' });
-    }
-    const commitResult = spawnSync('git', ['commit', '-m', 'migrate: knowledge-v2 (wiki links, synthesis, session move, cleanup)'], { cwd: vaultPath, stdio: 'pipe' });
-    if (commitResult.status !== 0) {
-        const stderr = commitResult.stderr?.toString() ?? 'unknown error';
-        process.stderr.write(`Warning: git commit failed: ${stderr}\n`);
-        report.gitCommitFailed = true;
-    }
-    // Post-commit: generate index.md (not committed — gitignored)
-    generateVaultIndex(vaultPath);
-    return report;
-}

package/dist/migrate-next-actions.d.ts

@@ -1,6 +0,0 @@
-export interface MigrationReport {
-    candidates: number;
-    migrated: number;
-    details: string[];
-}
-export declare function migrateNextActions(vaultPath: string, apply: boolean): MigrationReport;

package/dist/migrate-next-actions.js

@@ -1,32 +0,0 @@
-// src/migrate-next-actions.ts
-import { readdirSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { parseFilePath, serializeFile } from './vault.js';
-import { addNextAction } from './sections.js';
-export function migrateNextActions(vaultPath, apply) {
-    const entDir = join(vaultPath, 'entities');
-    const files = readdirSync(entDir).filter(f => f.endsWith('.md'));
-    const report = { candidates: 0, migrated: 0, details: [] };
-    for (const file of files) {
-        const filePath = join(entDir, file);
-        const { frontmatter: fm, body } = parseFilePath(filePath);
-        const nextAction = fm['next-action'];
-        // Skip if no next-action or it's null/empty
-        if (!nextAction || typeof nextAction !== 'string' || nextAction.trim() === '')
-            continue;
-        // Skip if already has a Next Actions section (idempotent)
-        if (body.includes('## Next Actions')) {
-            report.details.push(`${file}: skipped (already has ## Next Actions)`);
-            continue;
-        }
-        report.candidates++;
-        report.details.push(`${file}: next-action = "${nextAction}"`);
-        if (apply) {
-            const newBody = addNextAction(body, nextAction);
-            delete fm['next-action'];
-            writeFileSync(filePath, serializeFile(fm, newBody));
-            report.migrated++;
-        }
-    }
-    return report;
-}

package/dist/migrate-types.d.ts

@@ -1,11 +0,0 @@
-export interface MigrationReport {
-    typeChanges: number;
-    statusChanges: number;
-    knowledgeSubtypeAdded: number;
-    bodySectionsRestructured: number;
-    malformed: string[];
-    skipped: string[];
-    details: string[];
-    applied: boolean;
-}
-export declare function migrateTypes(vaultPath: string, apply: boolean): MigrationReport;

package/dist/migrate-types.js

@@ -1,142 +0,0 @@
-// src/migrate-types.ts
-import { readdirSync, writeFileSync, existsSync } from 'fs';
-import { join, relative } from 'path';
-import { parseFilePath, serializeFile } from './vault.js';
-// --- Type and status mapping tables ---
-const TYPE_MAP = {
-    thread: 'entity',
-    idea: 'entity',
-    area: 'project',
-    inbox: 'capture',
-};
-const STATUS_MAP = {
-    simmering: 'paused',
-    dormant: 'paused',
-};
-function newReport(applied) {
-    return { typeChanges: 0, statusChanges: 0, knowledgeSubtypeAdded: 0, bodySectionsRestructured: 0, malformed: [], skipped: [], details: [], applied };
-}
-/** Migrate a single entity file's frontmatter. Returns null if no change needed. */
-function migrateEntityFrontmatter(fm, filename, report) {
-    const rawType = fm.type;
-    // Malformed: missing type field
-    if (rawType === undefined || rawType === null) {
-        report.malformed.push(filename);
-        report.details.push(`${filename}: SKIPPED — missing type field`);
-        return null;
-    }
-    // Already-valid type and status — skip
-    const mappedType = TYPE_MAP[rawType] ?? rawType;
-    const mappedStatus = STATUS_MAP[fm.status] ?? fm.status;
-    const typeChanged = mappedType !== rawType;
-    const statusChanged = mappedStatus !== fm.status;
-    if (!typeChanged && !statusChanged) {
-        report.skipped.push(filename);
-        return null;
-    }
-    const newFm = { ...fm };
-    if (typeChanged) {
-        newFm.type = mappedType;
-        report.typeChanges++;
-        report.details.push(`${filename}: type ${rawType} → ${mappedType}`);
-    }
-    if (statusChanged) {
-        newFm.status = mappedStatus;
-        report.statusChanges++;
-        report.details.push(`${filename}: status ${fm.status} → ${mappedStatus}`);
-    }
-    return newFm;
-}
-/**
- * Restructure body sections for old template types.
- * - idea entities: ## Hypothesis → ## Context
- * Returns the new body and whether any restructuring occurred.
- * Checks unconditionally for ## Hypothesis — only idea entities use that heading,
- * and this makes the rename idempotent regardless of whether the type rename already ran.
- */
-function migrateEntityBody(body) {
-    let newBody = body;
-    let changed = false;
-    // idea template used ## Hypothesis where entity template expects ## Context.
-    // Check unconditionally so a partial migration (type renamed, body not yet renamed) is safe to rerun.
-    const re = /^## Hypothesis$/m;
-    if (re.test(newBody)) {
-        newBody = newBody.replace(re, '## Context');
-        changed = true;
-    }
-    return { body: newBody, changed };
-}
-/** Scan entity dir (and entities/archive if present) and return all .md files with their paths. */
-function collectEntityFiles(vaultPath) {
-    const entDir = join(vaultPath, 'entities');
-    const files = readdirSync(entDir)
-        .filter(f => f.endsWith('.md'))
-        .map(f => join(entDir, f));
-    const archiveDir = join(entDir, 'archive');
-    if (existsSync(archiveDir)) {
-        readdirSync(archiveDir)
-            .filter(f => f.endsWith('.md'))
-            .forEach(f => files.push(join(archiveDir, f)));
-    }
-    return files;
-}
-export function migrateTypes(vaultPath, apply) {
-    const report = newReport(apply);
-    // --- 1. Entity files ---
-    const entityFiles = collectEntityFiles(vaultPath);
-    const entityWrites = [];
-    for (const filePath of entityFiles) {
-        const filename = relative(vaultPath, filePath);
-        const { frontmatter: fm, body } = parseFilePath(filePath);
-        const newFm = migrateEntityFrontmatter(fm, filename, report);
-        // Skip malformed files entirely — no body migration either
-        if (report.malformed.includes(filename))
-            continue;
-        // Check body restructuring (unconditional — idempotent regardless of type rename order)
-        const { body: newBody, changed: bodyChanged } = migrateEntityBody(body);
-        if (bodyChanged) {
-            report.bodySectionsRestructured++;
-            report.details.push(`${filename}: ## Hypothesis → ## Context`);
-        }
-        if (newFm === null && !bodyChanged)
-            continue; // nothing to do
-        // Use newFm if frontmatter changed, else original fm (for body-only changes)
-        const finalFm = newFm ?? fm;
-        entityWrites.push({ filePath, content: serializeFile(finalFm, newBody) });
-    }
-    // --- 2. Knowledge files: add subtype: insight ---
-    const knowledgeDir = join(vaultPath, 'knowledge');
-    const knowledgeFiles = existsSync(knowledgeDir)
-        ? readdirSync(knowledgeDir).filter(f => f.endsWith('.md')).map(f => join(knowledgeDir, f))
-        : [];
-    const knowledgeWrites = [];
-    const REVIEW_KEYWORDS = /reference|guide|template|framework|checklist|how-to|integration/i;
-    for (const filePath of knowledgeFiles) {
-        const filename = relative(vaultPath, filePath);
-        const { frontmatter: fm, body } = parseFilePath(filePath);
-        if (fm.subtype !== undefined) {
-            report.skipped.push(filename);
-            continue;
-        }
-        const newFm = { ...fm, subtype: 'insight' };
-        report.knowledgeSubtypeAdded++;
-        const needsReview = REVIEW_KEYWORDS.test(filename);
-        report.details.push(`${filename}: added subtype: insight${needsReview ? ' ⚠ review — may not be an insight' : ''}`);
-        knowledgeWrites.push({ filePath, content: serializeFile(newFm, body) });
-    }
-    if (!apply)
-        return report;
-    // --- Write all changed files. Crash during write-back → git checkout HEAD -- entities/ knowledge/ ---
-    const allWrites = [...entityWrites, ...knowledgeWrites];
-    try {
-        for (const { filePath, content } of allWrites) {
-            writeFileSync(filePath, content);
-        }
-    }
-    catch (err) {
-        process.stderr.write(`\nMigration failed during write: ${err}\n`);
-        process.stderr.write(`Recovery: git -C ${vaultPath} checkout HEAD -- entities/ knowledge/\n`);
-        throw err;
-    }
-    return report;
-}