@qiqiangvae/dsh-obsidian 0.1.0

package/lib/types.js

@@ -0,0 +1,6 @@
+/**
+ * types.ts — minimal type declarations for the DSH cordis API we use.
+ * When dsh bumps the public API, update these; the loader reports mismatches.
+ */
+export {};
+//# sourceMappingURL=types.js.map

package/lib/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;GAGG"}

package/lib/vault.d.ts

@@ -0,0 +1,69 @@
+/**
+ * vault.ts — vault file operations, type routing, frontmatter bookkeeping.
+ *
+ * Re-implementation of the LLM Wiki pattern's mechanical core (paths,
+ * frontmatter, master index, log, source delta tracking). Adapted from
+ * dsh-plugin-wiki-tools; now written directly against node:fs in modern
+ * TypeScript so it survives cordis API churn.
+ */
+import type { PluginConfig } from './types.js';
+export type { PluginConfig } from './types.js';
+export interface VaultLayout {
+    wikiDir: string;
+    rawDir: string;
+    metaDir: string;
+    indexFile: string;
+    logFile: string;
+    hotFile: string;
+    typeFolders: Record<string, string>;
+}
+export declare function resolveLayout(vaultPath: string, config: PluginConfig): VaultLayout;
+export declare function isMachineryPage(name: string): boolean;
+export declare function isPortableFilename(name: string): boolean;
+/** Reject any path that resolves outside vaultPath. */
+export declare function assertInsideVault(vaultPath: string, target: string): void;
+export interface Frontmatter {
+    title?: string;
+    type?: string;
+    tags?: string[];
+    created?: string;
+    updated?: string;
+    source?: string;
+    source_hash?: string;
+    [k: string]: unknown;
+}
+export declare function parseFrontmatter(md: string): {
+    fm: Frontmatter;
+    body: string;
+};
+export declare function serializeFrontmatter(fm: Frontmatter): string;
+export declare function completeFrontmatter(existing: Frontmatter, patch: Partial<Frontmatter>, now?: string): Frontmatter;
+export declare function upsertIndexEntry(indexFile: string, type: string, sectionHeading: string, title: string, style?: ':' | '—'): void;
+export declare function appendLog(logFile: string, line: string): void;
+export interface WritePageArgs {
+    title: string;
+    type: string;
+    content: string;
+    tags?: string[];
+    source_path?: string;
+    force?: boolean;
+}
+export interface WritePageResult {
+    path: string;
+    unresolvedLinks: string[];
+    sourceHash?: string;
+    skipped?: boolean;
+}
+export declare function safeFilename(title: string): string;
+export declare function routePageFolder(vaultPath: string, layout: VaultLayout, type: string): string;
+export declare function collectUnresolvedLinks(body: string, knownTitles: Set<string>): string[];
+export declare function listAllTitles(wikiDir: string): Set<string>;
+export declare function sha256(s: string | Buffer): string;
+export declare function writePage(vaultPath: string, config: PluginConfig, args: WritePageArgs): WritePageResult;
+export declare function renamePage(vaultPath: string, config: PluginConfig, oldTitle: string, newTitle: string): {
+    from: string;
+    to: string;
+};
+export declare function deletePage(vaultPath: string, config: PluginConfig, title: string): void;
+export declare function walkMd(root: string): Generator<string>;
+//# sourceMappingURL=vault.d.ts.map

package/lib/vault.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vault.d.ts","sourceRoot":"","sources":["../src/vault.ts"],"names":[],"mappings":"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"}

package/lib/vault.js

@@ -0,0 +1,315 @@
+/**
+ * vault.ts — vault file operations, type routing, frontmatter bookkeeping.
+ *
+ * Re-implementation of the LLM Wiki pattern's mechanical core (paths,
+ * frontmatter, master index, log, source delta tracking). Adapted from
+ * dsh-plugin-wiki-tools; now written directly against node:fs in modern
+ * TypeScript so it survives cordis API churn.
+ */
+import { existsSync, readFileSync, writeFileSync, readdirSync, statSync, mkdirSync, renameSync, unlinkSync, } from 'node:fs';
+import { join, dirname, basename, extname, resolve, sep } from 'node:path';
+import { createHash } from 'node:crypto';
+// ──────────────────────────────────────────────────────────────────────────────
+// Defaults — overridable via config.typeFolders
+// ──────────────────────────────────────────────────────────────────────────────
+const DEFAULT_TYPE_FOLDERS = {
+    domain: 'wiki/areas',
+    area: 'wiki/areas',
+    project: 'wiki/projects',
+    resource: 'wiki/resources',
+    source: 'wiki/sources',
+    archive: 'wiki/archive',
+    index: 'wiki',
+    log: 'wiki',
+    hot: 'wiki',
+};
+export function resolveLayout(vaultPath, config) {
+    const typeFolders = { ...DEFAULT_TYPE_FOLDERS, ...(config.typeFolders ?? {}) };
+    return {
+        wikiDir: join(vaultPath, 'wiki'),
+        rawDir: join(vaultPath, '.raw'),
+        metaDir: join(vaultPath, 'wiki', 'meta'),
+        indexFile: join(vaultPath, 'wiki', 'index.md'),
+        logFile: join(vaultPath, 'wiki', 'log.md'),
+        hotFile: join(vaultPath, 'wiki', 'hot.md'),
+        typeFolders,
+    };
+}
+// ──────────────────────────────────────────────────────────────────────────────
+// Path safety — jail everything inside the configured vaultPath
+// ──────────────────────────────────────────────────────────────────────────────
+const RESERVED_DEVICE_NAMES = /^(con|prn|aux|nul|com[0-9]|lpt[0-9])$/i;
+const PORTABLE_BAD_CHARS = /[:<>"|?*\\]/;
+const PORTABLE_BAD_TAIL = /[ .]+$/;
+export function isMachineryPage(name) {
+    // case-insensitive: "Lint Report", "lint report", "LINT REPORT" all count
+    return /^lint report\b/i.test(name);
+}
+export function isPortableFilename(name) {
+    if (!name)
+        return false;
+    if (RESERVED_DEVICE_NAMES.test(name))
+        return false;
+    if (PORTABLE_BAD_CHARS.test(name))
+        return false;
+    if (PORTABLE_BAD_TAIL.test(name))
+        return false;
+    return true;
+}
+/** Reject any path that resolves outside vaultPath. */
+export function assertInsideVault(vaultPath, target) {
+    const abs = resolve(target);
+    const root = resolve(vaultPath);
+    if (abs !== root && !abs.startsWith(root + sep)) {
+        throw new Error(`path escapes vault: ${target}`);
+    }
+}
+const FM_RE = /^---\n([\s\S]*?)\n---\n?/;
+export function parseFrontmatter(md) {
+    const m = FM_RE.exec(md);
+    if (!m)
+        return { fm: {}, body: md };
+    const fm = {};
+    for (const line of m[1].split('\n')) {
+        const idx = line.indexOf(':');
+        if (idx < 0)
+            continue;
+        const key = line.slice(0, idx).trim();
+        let val = line.slice(idx + 1).trim();
+        if (typeof val === 'string' && val.startsWith('[') && val.endsWith(']')) {
+            // YAML-style inline list: [a, b, c] — split, strip quotes
+            val = val.slice(1, -1).split(',').map((s) => s.trim().replace(/^["']|["']$/g, '')).filter(Boolean);
+        }
+        else if (typeof val === 'string') {
+            val = val.replace(/^["']|["']$/g, '');
+        }
+        fm[key] = val;
+    }
+    return { fm, body: md.slice(m[0].length) };
+}
+export function serializeFrontmatter(fm) {
+    const lines = ['---'];
+    for (const [k, v] of Object.entries(fm)) {
+        if (v === undefined)
+            continue;
+        if (Array.isArray(v)) {
+            lines.push(`${k}: ${JSON.stringify(v)}`);
+        }
+        else if (typeof v === 'string' && (v.includes(':') || v.startsWith('['))) {
+            lines.push(`${k}: "${v.replace(/"/g, '\\"')}"`);
+        }
+        else {
+            lines.push(`${k}: ${v}`);
+        }
+    }
+    lines.push('---', '');
+    return lines.join('\n');
+}
+export function completeFrontmatter(existing, patch, now = new Date().toISOString().slice(0, 10)) {
+    const merged = { ...existing, ...patch };
+    if (!merged.created)
+        merged.created = existing.created ?? now;
+    merged.updated = now;
+    return merged;
+}
+// ──────────────────────────────────────────────────────────────────────────────
+// Index / log / hot bookkeeping
+// ──────────────────────────────────────────────────────────────────────────────
+export function upsertIndexEntry(indexFile, type, sectionHeading, title, style = ':') {
+    if (!existsSync(indexFile)) {
+        writeFileSync(indexFile, `# Index\n\n`);
+    }
+    const md = readFileSync(indexFile, 'utf8');
+    const sectionRe = new RegExp(`(^## ${escapeRe(sectionHeading)}\\n)([\\s\\S]*?)(?=^## |\\Z)`, 'm');
+    const m = sectionRe.exec(md);
+    const sep = style === '—' ? ' — ' : ': ';
+    const entry = `- [[${title}]]${sep}${type}\n`;
+    let next;
+    if (m) {
+        const body = m[2];
+        if (body.includes(`[[${title}]]`))
+            return; // already present
+        next = md.replace(m[0], m[1] + body + entry + m[3]);
+    }
+    else {
+        next = md + `\n## ${sectionHeading}\n\n` + entry;
+    }
+    writeFileSync(indexFile, next);
+}
+export function appendLog(logFile, line) {
+    if (!existsSync(dirname(logFile))) {
+        mkdirSync(dirname(logFile), { recursive: true });
+    }
+    const today = new Date().toISOString().slice(0, 10);
+    let md = existsSync(logFile) ? readFileSync(logFile, 'utf8') : `# Log\n\n`;
+    if (!md.startsWith(`## ${today}`)) {
+        md = `## ${today}\n\n` + md.replace(/^# Log\n\n/, '');
+    }
+    md = `- ${new Date().toISOString()} — ${line}\n` + md;
+    writeFileSync(logFile, md);
+}
+export function safeFilename(title) {
+    return title.replace(/[\\/]/g, '-').replace(/[<>:"?*|]/g, '').trim() || 'untitled';
+}
+// typeFolders values are RELATIVE TO vaultPath (they already include the
+// leading `wiki/` segment), e.g. `resource` → `wiki/resources`. Route against
+// vaultPath directly — never against wikiDir, which would double the `wiki/`.
+export function routePageFolder(vaultPath, layout, type) {
+    const folder = layout.typeFolders[type] ?? layout.typeFolders['resource'];
+    return join(vaultPath, folder);
+}
+export function collectUnresolvedLinks(body, knownTitles) {
+    const linkRe = /\[\[([^\]|]+)(?:\|[^\]]+)?\]\]/g;
+    const out = [];
+    const seen = new Set();
+    for (const m of body.matchAll(linkRe)) {
+        const t = m[1].trim();
+        if (knownTitles.has(t) || seen.has(t))
+            continue;
+        seen.add(t);
+        out.push(t);
+    }
+    return out;
+}
+export function listAllTitles(wikiDir) {
+    const titles = new Set();
+    if (!existsSync(wikiDir))
+        return titles;
+    for (const f of walkMd(wikiDir)) {
+        const base = basename(f, extname(f));
+        if (!isMachineryPage(base))
+            titles.add(base);
+    }
+    return titles;
+}
+export function sha256(s) {
+    return createHash('sha256').update(s).digest('hex');
+}
+export function writePage(vaultPath, config, args) {
+    const layout = resolveLayout(vaultPath, config);
+    const filename = safeFilename(args.title);
+    if (isMachineryPage(filename)) {
+        throw new Error(`refusing to write machinery page: ${filename}`);
+    }
+    if (!isPortableFilename(filename)) {
+        throw new Error(`non-portable filename: ${filename}`);
+    }
+    const folder = routePageFolder(vaultPath, layout, args.type);
+    assertInsideVault(vaultPath, folder);
+    if (!existsSync(folder))
+        mkdirSync(folder, { recursive: true });
+    const targetPath = join(folder, `${filename}.md`);
+    // filename-uniqueness guard
+    if (existsSync(targetPath) && args.title !== basename(targetPath, '.md')) {
+        throw new Error(`filename collision: ${targetPath}`);
+    }
+    // source hash + skip-on-unchanged
+    let sourceHash;
+    if (args.source_path) {
+        if (!existsSync(args.source_path)) {
+            throw new Error(`source not found: ${args.source_path}`);
+        }
+        sourceHash = sha256(readFileSync(args.source_path));
+    }
+    // parse existing page (if any) to preserve `created` and unknown fields
+    const existing = existsSync(targetPath)
+        ? parseFrontmatter(readFileSync(targetPath, 'utf8'))
+        : { fm: {}, body: '' };
+    if (existing.fm.source_hash && sourceHash && existing.fm.source_hash === sourceHash && !args.force) {
+        return { path: targetPath, unresolvedLinks: [], sourceHash, skipped: true };
+    }
+    const fm = completeFrontmatter(existing.fm, {
+        title: args.title,
+        type: args.type,
+        tags: args.tags,
+        source: args.source_path,
+        source_hash: sourceHash,
+    });
+    const final = serializeFrontmatter(fm) + args.content;
+    writeFileSync(targetPath, final, 'utf8');
+    // index & log
+    const sectionHeading = layout.typeFolders[args.type]?.replace(/^wiki\//, '') ?? args.type;
+    upsertIndexEntry(layout.indexFile, args.type, sectionHeading, args.title);
+    appendLog(layout.logFile, `${args.type} [[${args.title}]]${args.source_path ? ` (source ${args.source_path})` : ''}`);
+    // forward-link report
+    const titles = listAllTitles(layout.wikiDir);
+    titles.add(args.title);
+    const unresolvedLinks = collectUnresolvedLinks(args.content, titles);
+    return { path: targetPath, unresolvedLinks, sourceHash };
+}
+// ──────────────────────────────────────────────────────────────────────────────
+// Page rename with machinery protection
+// ──────────────────────────────────────────────────────────────────────────────
+export function renamePage(vaultPath, config, oldTitle, newTitle) {
+    const layout = resolveLayout(vaultPath, config);
+    const oldName = safeFilename(oldTitle);
+    const newName = safeFilename(newTitle);
+    if (isMachineryPage(oldName) || isMachineryPage(newName)) {
+        throw new Error('refusing to rename machinery page');
+    }
+    if (!isPortableFilename(newName)) {
+        throw new Error(`non-portable filename: ${newName}`);
+    }
+    // Locate the existing page across every effective type folder.
+    let from;
+    for (const type of Object.keys(layout.typeFolders)) {
+        const dir = routePageFolder(vaultPath, layout, type);
+        const candidate = join(dir, `${oldName}.md`);
+        if (existsSync(candidate)) {
+            from = candidate;
+            break;
+        }
+    }
+    if (!from)
+        throw new Error(`not found: ${oldTitle}`);
+    const toDir = dirname(from);
+    const to = join(toDir, `${newName}.md`);
+    if (existsSync(to))
+        throw new Error(`target exists: ${to}`);
+    renameSync(from, to);
+    return { from, to };
+}
+export function deletePage(vaultPath, config, title) {
+    const layout = resolveLayout(vaultPath, config);
+    const name = safeFilename(title);
+    if (isMachineryPage(name))
+        throw new Error('refusing to delete machinery page');
+    // search in all effective typeFolders
+    for (const type of Object.keys(layout.typeFolders)) {
+        const p = join(routePageFolder(vaultPath, layout, type), `${name}.md`);
+        if (existsSync(p)) {
+            unlinkSync(p);
+            return;
+        }
+    }
+    throw new Error(`not found: ${title}`);
+}
+// ──────────────────────────────────────────────────────────────────────────────
+// Walk helpers
+// ──────────────────────────────────────────────────────────────────────────────
+export function* walkMd(root) {
+    if (!existsSync(root))
+        return;
+    for (const entry of readdirSync(root)) {
+        const p = join(root, entry);
+        let st;
+        try {
+            st = statSync(p);
+        }
+        catch {
+            continue;
+        }
+        if (st.isDirectory()) {
+            if (entry === 'meta' || entry.startsWith('.'))
+                continue;
+            yield* walkMd(p);
+        }
+        else if (st.isFile() && p.endsWith('.md')) {
+            yield p;
+        }
+    }
+}
+function escapeRe(s) {
+    return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+//# sourceMappingURL=vault.js.map

package/lib/vault.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vault.js","sourceRoot":"","sources":["../src/vault.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -0,0 +1,66 @@
+{
+  "name": "@qiqiangvae/dsh-obsidian",
+  "version": "0.1.0",
+  "description": "Self-organizing AI second brain for Obsidian, as a single DeepSeek Harness plugin. Merged fork of dsh-plugin-wiki-skills + dsh-plugin-wiki-tools, targeting parity with claude-obsidian.",
+  "type": "module",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "exports": {
+    ".": "./index.js",
+    "./lib/vault.js": "./lib/vault.js",
+    "./lib/search.js": "./lib/search.js",
+    "./lib/lint.js": "./lib/lint.js",
+    "./lib/scaffold.js": "./lib/scaffold.js",
+    "./lib/skills.js": "./lib/skills.js",
+    "./lib/types.js": "./lib/types.js",
+    "./cordis.patch.yml": "./cordis.patch.yml",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "index.js",
+    "lib/",
+    "cordis.patch.yml",
+    "skills/",
+    "README.md",
+    "LICENSE",
+    "ATTRIBUTION.md"
+  ],
+  "keywords": [
+    "dsh-plugin",
+    "deepseek-harness",
+    "obsidian",
+    "knowledge-base",
+    "second-brain",
+    "llm-wiki"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/qiqiangvae/dsh-obsidian.git"
+  },
+  "license": "MIT",
+  "engines": {
+    "node": ">=22.19.0"
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "*",
+    "@deepseek-ai/dsh-tools": "*",
+    "@deepseek-ai/schemastery": "*"
+  },
+  "scripts": {
+    "test": "node --test test/basic.test.mjs test/apply.smoke.test.mjs",
+    "build": "tsc -p tsconfig.json",
+    "prepublishOnly": "npm run build"
+  },
+  "devDependencies": {
+    "typescript": "^5.5.0",
+    "@types/node": "^20.0.0",
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-tools": "^0.0.1-rc.1",
+    "@deepseek-ai/schemastery": "^3.18.1"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    }
+  }
+}

package/skills/defuddle/SKILL.md

@@ -0,0 +1,35 @@
+---
+name: defuddle
+description: Extract clean markdown from a web page (article, blog post, doc page) by stripping nav, ads, cookie banners, and chrome. Use before ingesting a URL into the vault, to save tokens and keep the source readable.
+---
+
+# defuddle
+
+Clean a web page down to its article body.
+
+## When to use
+
+- Before any URL ingestion via `wiki-ingest`, prefer running the URL through
+  defuddle-style extraction.
+- The actual extraction is done by the [Defuddle](https://github.com/kepano/defuddle)
+  CLI / npm package. The skill's job is to *instruct* the agent to call it.
+
+## Workflow
+
+1. Fetch the URL. If the response is already markdown, skip defuddle.
+2. Otherwise, run `npx defuddle <url>` (or the equivalent in your runtime).
+3. Hand the cleaned markdown to `wiki-ingest` to write a `resource` page.
+
+## What defuddle removes
+
+- Nav, header, footer
+- Cookie / GDPR banners
+- Sidebars, related-article blocks
+- Most ads and trackers
+
+## What it preserves
+
+- Article title (h1)
+- Author and date metadata
+- Headings, paragraphs, lists, code blocks
+- Images (with src intact)

package/skills/json-canvas/SKILL.md

@@ -0,0 +1,61 @@
+---
+name: json-canvas
+description: Create and edit JSON Canvas (.canvas) files: nodes (text, file, link, group), edges, and layout. Use to produce visual mind-maps, knowledge graphs, or workflow diagrams from vault content.
+---
+
+# json-canvas
+
+JSON Canvas is an open spec (https://jsoncanvas.org). Obsidian Canvas reads
+these files. Other readers: Kinopio, Jiyuu.
+
+## Schema (1.0)
+
+```json
+{
+  "nodes": [
+    {
+      "id": "uuid-or-string",
+      "type": "text",
+      "x": 0, "y": 0, "width": 250, "height": 100,
+      "label": "Optional",
+      "text": "# Heading\nMarkdown body"
+    },
+    {
+      "id": "uuid-or-string",
+      "type": "file",
+      "x": 300, "y": 0, "width": 250, "height": 100,
+      "file": "Notes/My Note.md"
+    },
+    {
+      "id": "uuid-or-string",
+      "type": "link",
+      "x": 600, "y": 0, "width": 250, "height": 100,
+      "url": "https://example.com"
+    },
+    {
+      "id": "uuid-or-string",
+      "type": "group",
+      "x": 0, "y": 150, "width": 500, "height": 200,
+      "label": "Cluster",
+      "color": "1"
+    }
+  ],
+  "edges": [
+    {
+      "id": "edge-1",
+      "fromNode": "uuid-1",
+      "fromSide": "right",
+      "toNode":   "uuid-2",
+      "toSide":   "left",
+      "label": "links to"
+    }
+  ]
+}
+```
+
+## Tips
+
+- Generate `id`s as stable strings; downstream tools dedupe on them.
+- Coordinates: pixel units; Obsidian's default zoom fits 100×100.
+- For "graph from vault wikilinks", walk pages, build nodes per title,
+  and add an edge for each `[[link]]` occurrence.

package/skills/obsidian-bases/SKILL.md

@@ -0,0 +1,51 @@
+---
+name: obsidian-bases
+description: Create and edit Obsidian Bases (.base) with views, filters, formulas, and summaries. Use when the user asks for a tabular view, a project dashboard, or a filtered list of pages by property.
+---
+
+# obsidian-bases
+
+Obsidian Bases are `.base` YAML files in the vault root (or anywhere).
+
+## Minimal example
+
+```yaml
+title: Projects
+filter:
+  and:
+    - type == "project"
+views:
+  - type: table
+    name: Active
+    filter:
+      and:
+        - status == "active"
+    order:
+      - file.name
+      - due
+      - status
+  - type: cards
+    name: By status
+    groupBy: status
+```
+
+## Common formula patterns
+
+```yaml
+formulas:
+  days_to_due: (date(prop("due")) - today()) / 86400000
+  is_overdue: (date(prop("due")) < today()) && (prop("status") != "done")
+```
+
+## Common gotchas
+
+- Property names with spaces must be quoted: `prop("Project Status")`.
+- `today()` is midnight UTC; for day-level comparisons use
+  `date(prop("due")) < today()` rather than raw string compare.
+- `groupBy` on a missing property silently groups everything into `null`.
+
+## When to use
+
+- A "Project dashboard" → `groupBy: status, orderBy: due`
+- A "Reading list" → `filter: type == "resource" && status == "to-read"`
+- A "By author" view → `groupBy: author`