@doquflow/cli 1.6.0 → 2.0.0

package/dist/commands/query.js

@@ -0,0 +1,144 @@
+"use strict";
+/**
+ * docuflow query
+ *
+ * Calls query_wiki and renders the answer with citations.
+ *
+ * Usage:
+ *   docuflow query "<question>"
+ *   docuflow query "<question>" --max-sources 5
+ *   docuflow query "<question>" --json
+ *   docuflow query "<question>" --no-cite
+ *   docuflow query "<question>" --save-as "<title>"
+ *   docuflow query "<question>" --quiet
+ *
+ * Exit codes:
+ *   0 — answer produced
+ *   2 — fatal (.docuflow missing, server tool not found)
+ *   3 — query produced no matching sources
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = run;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+// ─── Colour helpers ────────────────────────────────────────────────────────────
+const c = {
+    green: (s) => `\x1b[32m${s}\x1b[0m`,
+    yellow: (s) => `\x1b[33m${s}\x1b[0m`,
+    red: (s) => `\x1b[31m${s}\x1b[0m`,
+    cyan: (s) => `\x1b[36m${s}\x1b[0m`,
+    dim: (s) => `\x1b[2m${s}\x1b[0m`,
+    bold: (s) => `\x1b[1m${s}\x1b[0m`,
+};
+// ─── Dynamic server tool loader (mirrors rewiki.ts pattern) ───────────────────
+function loadServerTool(toolFile) {
+    const candidates = [
+        () => require(`@doquflow/core/dist/tools/${toolFile}`),
+        () => require(node_path_1.default.resolve(__dirname, "../../../core/dist/tools", toolFile)),
+        () => require(node_path_1.default.resolve(__dirname, "../../core/dist/tools", toolFile)),
+        () => require(`@doquflow/studio/dist/tools/${toolFile}`),
+        () => require(node_path_1.default.resolve(__dirname, "../../../studio/dist/tools", toolFile)),
+        () => require(node_path_1.default.resolve(__dirname, "../../studio/dist/tools", toolFile)),
+    ];
+    for (const attempt of candidates) {
+        try {
+            return attempt();
+        }
+        catch { }
+    }
+    throw new Error(`Cannot load server tool "${toolFile}". Run "npm run build" first.`);
+}
+async function run(options) {
+    const { question, maxSources = 5, json = false, noCite = false, saveAs, quiet = false } = options;
+    const projectPath = node_path_1.default.resolve(process.cwd());
+    const docuDir = node_path_1.default.join(projectPath, ".docuflow");
+    function info(msg) { if (!quiet)
+        console.log(msg); }
+    // ── Validate question ───────────────────────────────────────────────────────
+    if (!question || question.trim() === "") {
+        console.error(c.red("  ✗ Question is required."));
+        console.error(`    Usage: docuflow query "<question>"`);
+        process.exit(2);
+    }
+    // ── Pre-flight ──────────────────────────────────────────────────────────────
+    if (!node_fs_1.default.existsSync(docuDir)) {
+        console.error(c.red(`  ✗ .docuflow/ not found at ${projectPath}`));
+        console.error(`    Run "docuflow init" first.`);
+        process.exit(2);
+    }
+    // ── Load tools ──────────────────────────────────────────────────────────────
+    let queryWiki;
+    let saveAnswerAsPage;
+    try {
+        ({ queryWiki } = loadServerTool("query-wiki"));
+        if (saveAs) {
+            ({ saveAnswerAsPage } = loadServerTool("save-answer-as-page"));
+        }
+    }
+    catch (e) {
+        console.error(c.red(`  ✗ ${e.message}`));
+        process.exit(2);
+    }
+    // ── Execute query ───────────────────────────────────────────────────────────
+    info(c.dim(`  Searching wiki for: "${question}"`));
+    let result;
+    try {
+        result = await queryWiki({ project_path: projectPath, question, max_sources: maxSources });
+    }
+    catch (e) {
+        console.error(c.red(`  ✗ Query failed: ${e.message}`));
+        process.exit(2);
+    }
+    if (result.error) {
+        console.error(c.red(`  ✗ ${result.error}`));
+        process.exit(2);
+    }
+    // ── No sources found ────────────────────────────────────────────────────────
+    if (!result.source_pages || result.source_pages.length === 0) {
+        if (!json) {
+            console.error(c.yellow("  No matching sources found in the wiki."));
+            console.error(`  Try running "docuflow rewiki" to rebuild the wiki first.`);
+        }
+        process.exit(3);
+    }
+    // ── Output ──────────────────────────────────────────────────────────────────
+    if (json) {
+        console.log(JSON.stringify({
+            question: result.question,
+            answer: result.answer,
+            source_pages: result.source_pages,
+            search_results: result.search_results,
+            confidence: result.confidence,
+        }, null, 2));
+    }
+    else if (noCite) {
+        console.log(result.answer);
+    }
+    else {
+        console.log(result.answer);
+        console.log("");
+        console.log(c.bold("## Sources"));
+        for (const page of result.source_pages) {
+            console.log(`  - ${page.title} ${c.dim("(" + page.page_id + ")")}`);
+        }
+    }
+    // ── Save ────────────────────────────────────────────────────────────────────
+    if (saveAs && saveAnswerAsPage) {
+        try {
+            const saved = await saveAnswerAsPage({
+                project_path: projectPath,
+                question,
+                answer: result.answer,
+                page_title: saveAs,
+                source_page_ids: (result.source_pages ?? []).map((p) => p.page_id),
+            });
+            process.stderr.write(`page-id: ${saved?.page_id ?? saveAs}\n`);
+        }
+        catch (e) {
+            process.stderr.write(c.red(`Warning: could not save page: ${e.message}\n`));
+        }
+    }
+}

package/dist/commands/recent.js

@@ -2,9 +2,9 @@
 /**
  * docuflow recent
  *
- * Aggregates recent work by scanning .devloop/specs/TASK-*.md files,
- * correlating git commits by task ID, reading .docuflow/log.md for wiki
- * activity, and rendering a formatted dashboard in the terminal.
+ * Shows a dashboard of recent activity:
+ *   - Recent git commits (last N days)
+ *   - Recent wiki activity from .docuflow/log.md
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -14,106 +14,27 @@ exports.run = run;
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_child_process_1 = require("node:child_process");
-// ── ANSI helpers ────────────────────────────────────────────────────────────
+// ── ANSI helpers ──────────────────────────────────────────────────────────────
 const c = {
-    green: (s) => `\x1b[32m${s}\x1b[0m`,
-    yellow: (s) => `\x1b[33m${s}\x1b[0m`,
-    red: (s) => `\x1b[31m${s}\x1b[0m`,
     dim: (s) => `\x1b[2m${s}\x1b[0m`,
     bold: (s) => `\x1b[1m${s}\x1b[0m`,
+    cyan: (s) => `\x1b[36m${s}\x1b[0m`,
 };
-function colourStatus(status, text) {
-    if (status === "approved")
-        return c.green(text);
-    if (status === "needs-work")
-        return c.yellow(text);
-    if (status === "rejected")
-        return c.red(text);
-    return c.dim(text);
-}
-function normaliseStatus(raw) {
-    // Strip emojis (✅ ⚠️ ⏳ ❌) and other non-printable/non-ASCII characters
-    const stripped = raw.replace(/[^\x20-\x7E]/g, " ").trim().toLowerCase();
-    if (stripped.includes("approved"))
-        return "approved";
-    if (stripped.includes("needs-work") || stripped.includes("needs_work"))
-        return "needs-work";
-    if (stripped.includes("rejected"))
-        return "rejected";
-    if (stripped.includes("pending"))
-        return "pending";
-    return stripped.split(/\s+/)[0] || "pending";
-}
-function truncate(s, max) {
-    return s.length > max ? s.slice(0, max - 1) + "…" : s;
-}
 function formatDateYMD(d) {
     return d.toISOString().slice(0, 10);
 }
-// ── Git helper ───────────────────────────────────────────────────────────────
-function gitLog(taskId) {
+// ── Git commits (recent, date-filtered) ──────────────────────────────────────
+function recentCommits(days) {
     try {
-        const out = (0, node_child_process_1.execSync)(`git log --oneline --all --grep="${taskId}"`, { encoding: "utf8", stdio: ["pipe", "pipe", "ignore"] });
+        const out = (0, node_child_process_1.execSync)(`git log --oneline --since="${days} days ago"`, { encoding: "utf8", stdio: ["pipe", "pipe", "ignore"] });
         return out.trim().split("\n").filter(Boolean);
     }
     catch {
         return [];
     }
 }
-// ── Spec parser ───────────────────────────────────────────────────────────────
-async function parseSpec(specPath) {
-    let content;
-    try {
-        content = await promises_1.default.readFile(specPath, "utf8");
-    }
-    catch {
-        return {};
-    }
-    let title = "";
-    let feature = "";
-    let status = "pending";
-    for (const line of content.split("\n")) {
-        // First H1 heading: "# TASK-YYYYMMDD-HHMMSS: <title>"
-        if (!title && line.startsWith("# TASK-")) {
-            const colonIdx = line.indexOf(":");
-            if (colonIdx !== -1) {
-                title = line.slice(colonIdx + 1).trim();
-            }
-        }
-        // **Feature**: value
-        if (!feature && line.startsWith("**Feature**:")) {
-            feature = line.slice("**Feature**:".length).trim().slice(0, 120).trimEnd();
-        }
-        // **Status**: value
-        if (line.startsWith("**Status**:")) {
-            const raw = line.slice("**Status**:".length).trim();
-            status = normaliseStatus(raw);
-        }
-    }
-    return { title, feature, status };
-}
-// ── Review parser ────────────────────────────────────────────────────────────
-async function parseReview(reviewPath) {
-    let content;
-    try {
-        content = await promises_1.default.readFile(reviewPath, "utf8");
-    }
-    catch {
-        return { score: null, reviewVerdict: null };
-    }
-    let score = null;
-    let reviewVerdict = null;
-    const scoreMatch = content.match(/Score:\s*(\d+\/\d+)/);
-    if (scoreMatch)
-        score = scoreMatch[1];
-    const verdictMatch = content.match(/Verdict:\s*(APPROVED|NEEDS[\s_]WORK|REJECTED)/i);
-    if (verdictMatch) {
-        reviewVerdict = verdictMatch[1].toUpperCase().replace(/[\s-]+/g, "_");
-    }
-    return { score, reviewVerdict };
-}
-// ── Wiki log parser ──────────────────────────────────────────────────────────
-// log.md format: ## [2026-05-01T13:49:38.141Z] operation | description
+// ── Wiki log parsing ──────────────────────────────────────────────────────────
+const headingRe = /^##\s+\[([^\]]+)\]\s+([^|]+?)(?:\s*\|\s*(.+))?$/;
 async function parseWikiLog(logPath, since) {
     let content;
     try {
@@ -123,73 +44,80 @@ async function parseWikiLog(logPath, since) {
         return [];
     }
     const entries = [];
-    const headingRe = /^##\s+\[([^\]]+)\]\s+([^|]+)\|\s*(.+)$/;
     for (const line of content.split("\n")) {
-        const m = line.match(headingRe);
-        if (!m)
+        const m = headingRe.exec(line.trim());
+        if (!m) {
+            // Legacy pipe-delimited: timestamp | tool | target | delta
+            const parts = line.split("|").map(p => p.trim());
+            if (parts.length >= 3 && parts[0].includes("T")) {
+                const d = new Date(parts[0]);
+                if (!isNaN(d.getTime()) && d >= since) {
+                    entries.push({ date: formatDateYMD(d), operation: parts[1] ?? "", file: parts[2] ?? "" });
+                }
+            }
             continue;
-        const rawDate = m[1].trim();
-        const operation = m[2].trim();
-        const file = m[3].trim();
-        const dateVal = new Date(rawDate);
-        if (!isNaN(dateVal.getTime()) && dateVal >= since) {
-            entries.push({ date: rawDate.slice(0, 10), operation, file });
         }
+        const d = new Date(m[1]);
+        if (isNaN(d.getTime()) || d < since)
+            continue;
+        entries.push({ date: formatDateYMD(d), operation: (m[2] ?? "").trim(), file: (m[3] ?? "").trim() });
     }
     return entries;
 }
-// ── Renderers ────────────────────────────────────────────────────────────────
-function renderTable(tasks, allCommits, wikiEntries, days, fromDate, toDate) {
-    const SEP = "─".repeat(72);
-    console.log(c.bold(`Recent Work — last ${days} days (${fromDate} → ${toDate})`));
-    console.log(SEP);
-    console.log(` ${"TASK".padEnd(24)} ${"TITLE".padEnd(40)} ${"STATUS".padEnd(12)} SCORE`);
-    console.log(SEP);
-    for (const t of tasks) {
-        const title = truncate(t.title || t.feature, 40).padEnd(40);
-        const status = t.status.padEnd(12);
-        const score = t.score ?? "—";
-        const row = ` ${t.id.padEnd(24)} ${title} ${status} ${score}`;
-        console.log(colourStatus(t.status, row));
+// ── Renderers ─────────────────────────────────────────────────────────────────
+function renderTable(commits, wikiEntries, days) {
+    const fromDate = formatDateYMD(new Date(Date.now() - days * 86400000));
+    const toDate = formatDateYMD(new Date());
+    console.log("");
+    console.log(c.bold(`DocuFlow — Recent Activity (${fromDate} → ${toDate})`));
+    console.log("");
+    console.log(c.bold(`Git Commits (last ${days} days)`));
+    console.log("─".repeat(60));
+    if (commits.length === 0) {
+        console.log(c.dim("  No commits in this period."));
     }
-    console.log(SEP);
-    if (allCommits.length > 0) {
-        console.log("");
-        console.log(c.bold(`Git Commits (${allCommits.length} matching)`));
-        for (const line of allCommits) {
-            console.log(`  ${line}`);
+    else {
+        for (const line of commits) {
+            const sha = line.slice(0, 7);
+            const msg = line.slice(8);
+            console.log(`  ${c.cyan(sha)}  ${msg}`);
         }
     }
-    if (wikiEntries.length > 0) {
-        console.log("");
-        console.log(c.bold(`Wiki Activity (last ${days} days)`));
+    console.log("");
+    console.log(c.bold(`Wiki Activity (last ${days} days)`));
+    console.log("─".repeat(60));
+    if (wikiEntries.length === 0) {
+        console.log(c.dim("  No wiki activity in this period."));
+    }
+    else {
         for (const e of wikiEntries) {
-            console.log(`  ${e.date}  ${e.operation}  ${e.file}`);
+            console.log(`  ${c.dim(e.date)}  ${e.operation}${e.file ? "  " + c.dim(e.file) : ""}`);
         }
     }
+    console.log("");
 }
-function renderMarkdown(tasks, allCommits, wikiEntries, days, fromDate, toDate) {
-    console.log(`# Recent Work — last ${days} days (${fromDate} → ${toDate})`);
+function renderMarkdown(commits, wikiEntries, days) {
+    const fromDate = formatDateYMD(new Date(Date.now() - days * 86400000));
+    const toDate = formatDateYMD(new Date());
+    console.log(`# DocuFlow — Recent Activity (${fromDate} → ${toDate})`);
+    console.log("");
+    console.log(`## Git Commits (last ${days} days)`);
     console.log("");
-    console.log("| TASK | TITLE | STATUS | SCORE |");
-    console.log("|------|-------|--------|-------|");
-    for (const t of tasks) {
-        const title = truncate(t.title || t.feature, 40);
-        const score = t.score ?? "—";
-        console.log(`| ${t.id} | ${title} | ${t.status} | ${score} |`);
+    if (commits.length === 0) {
+        console.log("_No commits in this period._");
     }
-    if (allCommits.length > 0) {
-        console.log("");
-        console.log(`## Git Commits (${allCommits.length} matching)`);
-        console.log("");
-        for (const line of allCommits) {
+    else {
+        for (const line of commits) {
             console.log(`- ${line}`);
         }
     }
-    if (wikiEntries.length > 0) {
-        console.log("");
-        console.log(`## Wiki Activity (last ${days} days)`);
-        console.log("");
+    console.log("");
+    console.log(`## Wiki Activity (last ${days} days)`);
+    console.log("");
+    if (wikiEntries.length === 0) {
+        console.log("_No wiki activity in this period._");
+    }
+    else {
         console.log("| Date | Operation | File |");
         console.log("|------|-----------|------|");
         for (const e of wikiEntries) {
@@ -197,80 +125,19 @@ function renderMarkdown(tasks, allCommits, wikiEntries, days, fromDate, toDate)
         }
     }
 }
-// ── Main entry point ─────────────────────────────────────────────────────────
+// ── Main entry point ──────────────────────────────────────────────────────────
 async function run(opts = { days: 7, format: "table" }) {
     const days = Math.max(1, isNaN(opts.days) ? 7 : opts.days);
     const format = opts.format ?? "table";
-    const isMd = format === "md";
     const cwd = process.cwd();
-    const specsDir = node_path_1.default.join(cwd, ".devloop", "specs");
     const logPath = node_path_1.default.join(cwd, ".docuflow", "log.md");
-    const now = new Date();
-    const since = new Date(now.getTime() - days * 24 * 60 * 60 * 1000);
-    // Collect spec files
-    let specFiles = [];
-    try {
-        const entries = await promises_1.default.readdir(specsDir);
-        specFiles = entries
-            .filter(f => /^TASK-\d{8}-\d{6}\.md$/.test(f))
-            .map(f => node_path_1.default.join(specsDir, f));
-    }
-    catch {
-        console.log(`No tasks found in the last ${days} days.`);
-        return;
-    }
-    // Filter by mtime and parse each spec
-    const tasks = [];
-    for (const specPath of specFiles) {
-        let stat;
-        try {
-            stat = await promises_1.default.stat(specPath);
-        }
-        catch {
-            continue;
-        }
-        if (stat.mtime < since)
-            continue;
-        const stem = node_path_1.default.basename(specPath, ".md"); // TASK-YYYYMMDD-HHMMSS
-        const specFields = await parseSpec(specPath);
-        if (!specFields.title && !specFields.feature)
-            continue; // unreadable
-        const reviewPath = node_path_1.default.join(specsDir, `${stem}-review.md`);
-        const { score, reviewVerdict } = await parseReview(reviewPath);
-        // Override status from review verdict if present
-        let status = specFields.status ?? "pending";
-        if (reviewVerdict === "APPROVED")
-            status = "approved";
-        else if (reviewVerdict === "NEEDS_WORK")
-            status = "needs-work";
-        else if (reviewVerdict === "REJECTED")
-            status = "rejected";
-        const commits = gitLog(stem);
-        tasks.push({
-            id: stem,
-            title: specFields.title ?? "",
-            feature: specFields.feature ?? "",
-            status,
-            score,
-            reviewVerdict,
-            commits,
-            specMtime: stat.mtime,
-        });
-    }
-    // Sort newest first
-    tasks.sort((a, b) => b.specMtime.getTime() - a.specMtime.getTime());
-    if (tasks.length === 0) {
-        console.log(`No tasks found in the last ${days} days.`);
-        return;
-    }
-    const fromDate = formatDateYMD(since);
-    const toDate = formatDateYMD(now);
-    const allCommits = tasks.flatMap(t => t.commits);
+    const since = new Date(Date.now() - days * 24 * 60 * 60 * 1000);
+    const commits = recentCommits(days);
     const wikiEntries = await parseWikiLog(logPath, since);
-    if (isMd) {
-        renderMarkdown(tasks, allCommits, wikiEntries, days, fromDate, toDate);
+    if (format === "md") {
+        renderMarkdown(commits, wikiEntries, days);
     }
     else {
-        renderTable(tasks, allCommits, wikiEntries, days, fromDate, toDate);
+        renderTable(commits, wikiEntries, days);
     }
 }

package/dist/commands/rewiki.js

@@ -36,9 +36,12 @@ const c = {
 // ─── Dynamic server tool loader (mirrors sync.ts pattern) ─────────────────────
 function loadServerTool(toolFile) {
     const candidates = [
-        () => require(`@doquflow/server/dist/tools/${toolFile}`),
-        () => require(node_path_1.default.resolve(__dirname, "../../../server/dist/tools", toolFile)),
-        () => require(node_path_1.default.resolve(__dirname, "../../server/dist/tools", toolFile)),
+        () => require(`@doquflow/core/dist/tools/${toolFile}`),
+        () => require(node_path_1.default.resolve(__dirname, "../../../core/dist/tools", toolFile)),
+        () => require(node_path_1.default.resolve(__dirname, "../../core/dist/tools", toolFile)),
+        () => require(`@doquflow/studio/dist/tools/${toolFile}`),
+        () => require(node_path_1.default.resolve(__dirname, "../../../studio/dist/tools", toolFile)),
+        () => require(node_path_1.default.resolve(__dirname, "../../studio/dist/tools", toolFile)),
     ];
     for (const attempt of candidates) {
         try {

package/dist/commands/sync.js

@@ -39,9 +39,14 @@ const c = {
 // ─── Dynamic server tool loader ────────────────────────────────────────────────
 function loadServerTool(toolFile) {
     const candidates = [
-        () => require(`@doquflow/server/dist/tools/${toolFile}`),
-        () => require(node_path_1.default.resolve(__dirname, "../../../server/dist/tools", toolFile)),
-        () => require(node_path_1.default.resolve(__dirname, "../../server/dist/tools", toolFile)),
+        // v2.0 — 4 core tools live in @doquflow/core
+        () => require(`@doquflow/core/dist/tools/${toolFile}`),
+        () => require(node_path_1.default.resolve(__dirname, "../../../core/dist/tools", toolFile)),
+        () => require(node_path_1.default.resolve(__dirname, "../../core/dist/tools", toolFile)),
+        // v2.0 — 11 advanced tools live in @doquflow/studio
+        () => require(`@doquflow/studio/dist/tools/${toolFile}`),
+        () => require(node_path_1.default.resolve(__dirname, "../../../studio/dist/tools", toolFile)),
+        () => require(node_path_1.default.resolve(__dirname, "../../studio/dist/tools", toolFile)),
     ];
     for (const attempt of candidates) {
         try {
@@ -135,10 +140,10 @@ function runClaudeSync(prompt, projectPath, allowDangerousPermissions = false) {
     // Build the MCP config pointing to the local server binary
     let serverBin;
     try {
-        serverBin = require.resolve("@doquflow/server/dist/index.js");
+        serverBin = require.resolve("@doquflow/studio/dist/mcp/index.js");
     }
     catch {
-        serverBin = node_path_1.default.resolve(__dirname, "../../server/dist/index.js");
+        serverBin = node_path_1.default.resolve(__dirname, "../../studio/dist/mcp/index.js");
     }
     const mcpConfig = JSON.stringify({
         mcpServers: {

package/dist/commands/ui.js

@@ -27,7 +27,7 @@ const init_1 = require("./init");
 const watch_1 = require("./watch");
 function loadTool(file, exportName) {
     // eslint-disable-next-line @typescript-eslint/no-require-imports
-    return require(`@doquflow/server/dist/tools/${file}`)[exportName];
+    return require(`@doquflow/studio/dist/tools/${file}`)[exportName];
 }
 // ── Helpers ───────────────────────────────────────────────────────────────────
 async function findDocuflowProjects(scanRoot) {

package/dist/commands/update.js

@@ -102,7 +102,7 @@ async function run(opts = {}) {
         process.exit(result.status ?? 1);
     }
     console.log(`\n✓ Updated to ${latest}.`);
-    console.log(`  This refreshed the CLI, bundled UI (ui-dist), and the @doquflow/server dependency.`);
+    console.log(`  This refreshed the CLI, bundled UI (ui-dist), and the @doquflow/core + @doquflow/studio dependencies.`);
     const stale = await isPortInUse(DEFAULT_PORT);
     if (stale) {
         console.log('');

package/dist/commands/watch.js

@@ -54,9 +54,12 @@ const node_child_process_1 = require("node:child_process");
 // ─── Dynamic server tool loader ────────────────────────────────────────────────
 function loadServerTool(toolFile) {
     const candidates = [
-        () => require(`@doquflow/server/dist/tools/${toolFile}`),
-        () => require(node_path_1.default.resolve(__dirname, "../../../server/dist/tools", toolFile)),
-        () => require(node_path_1.default.resolve(__dirname, "../../server/dist/tools", toolFile)),
+        () => require(`@doquflow/core/dist/tools/${toolFile}`),
+        () => require(node_path_1.default.resolve(__dirname, "../../../core/dist/tools", toolFile)),
+        () => require(node_path_1.default.resolve(__dirname, "../../core/dist/tools", toolFile)),
+        () => require(`@doquflow/studio/dist/tools/${toolFile}`),
+        () => require(node_path_1.default.resolve(__dirname, "../../../studio/dist/tools", toolFile)),
+        () => require(node_path_1.default.resolve(__dirname, "../../studio/dist/tools", toolFile)),
     ];
     for (const attempt of candidates) {
         try {
@@ -202,10 +205,10 @@ let _allowDangerousPermissions = false;
 function runClaudeCLI(prompt, timeoutMs = 120_000) {
     let serverBin;
     try {
-        serverBin = require.resolve("@doquflow/server/dist/index.js");
+        serverBin = require.resolve("@doquflow/studio/dist/mcp/index.js");
     }
     catch {
-        serverBin = node_path_1.default.resolve(__dirname, "../../server/dist/index.js");
+        serverBin = node_path_1.default.resolve(__dirname, "../../studio/dist/mcp/index.js");
     }
     const mcpConfig = JSON.stringify({
         mcpServers: { docuflow: { type: "stdio", command: process.execPath, args: [serverBin] } }