@winspan/claude-forge 8.54.4 → 9.2.0

package/dist/web/routes/skills-distill.js

@@ -0,0 +1,552 @@
+/**
+ * /api/skills/distill/* — Web wrapper around the distillation pipeline.
+ *
+ * R-A simplification (spec 1851):
+ *   - ANTHROPIC_API_KEY dependency removed; distill no longer takes an API
+ *     key (R-B will shell-out to `claude` CLI which uses the user's OAuth
+ *     session). Status surfaces `claudeCliAvailable` (hard-coded false in
+ *     R-A; R-B adds real detection).
+ *   - `useAgent` body field removed; the Phase B toggle no longer exists.
+ *   - `/run/:runId/continue` endpoint still mounted for SSE/UI compat but
+ *     R-A backs it with the same one-shot stub flow (no sample-approve gate).
+ *
+ * Endpoints kept:
+ *   GET  /api/skills/distill/status            — state file snapshot + isBusy
+ *   GET  /api/skills/distill/cost-estimate     — token estimate before run
+ *   GET  /api/skills/distill/review            — last review batch (diff data)
+ *   GET  /api/skills/distill/review/:topicId/diff
+ *   GET  /api/skills/distill/run/:runId/stream — SSE progress stream
+ *   POST /api/skills/distill/init              — clone upstreams, seed NOTICE
+ *   POST /api/skills/distill/run               — kick off run, returns runId
+ *   POST /api/skills/distill/run/:runId/continue — kept for UI back-compat
+ *   POST /api/skills/distill/refresh           — re-pull + re-distill
+ *   POST /api/skills/distill/apply/:topicId    — view-only git status echo
+ *   POST /api/skills/distill/cancel/:runId     — abort current job
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+import matter from 'gray-matter';
+import { logger } from '../../core/utils/logger.js';
+import { resolveDistilledOutputDir, getDistilledOutputDirCandidates, } from '../../core/utils/binary-paths.js';
+import { distillInit, distillReview, listStubTopics, DEFAULT_STATE_PATH, } from '../../skills/distill/index.js';
+import { distillManager, DistillConflictError, readDistillState, distillStateExists, } from '../services/distill-manager.js';
+import { findClaudeBin } from '../../skills/distill/claude-cli-resolver.js';
+const TOPIC_ID_RE = /^[a-z0-9][a-z0-9-]*$/;
+/**
+ * Spec 1641: stricter than TOPIC_ID_RE — outputId is a filename component
+ * (no `.md` suffix expected) and we require the `distilled-` prefix so a
+ * caller cannot inject arbitrary filenames into the distilled output dir.
+ */
+const OUTPUT_ID_RE = /^distilled-[a-z0-9][a-z0-9-]*$/;
+/**
+ * Heuristic token-cost estimate. R-A keeps the field so the UI's existing
+ * cost-modal continues to render; R-C/R-B will swap it for a "estimated
+ * claude CLI invocations" hint.
+ */
+function estimateTokens(opts) {
+    const scorerInputTokens = opts.candidateCount * 700;
+    const scorerOutputTokens = opts.candidateCount * 200;
+    const distillerInputTokens = Math.min(opts.candidateCount, opts.topicCap) * 3000;
+    const distillerOutputTokens = Math.min(opts.candidateCount, opts.topicCap) * 1500;
+    return {
+        scorerInputTokens,
+        scorerOutputTokens,
+        distillerInputTokens,
+        distillerOutputTokens,
+        total: scorerInputTokens + scorerOutputTokens + distillerInputTokens + distillerOutputTokens,
+    };
+}
+/**
+ * Local-only IP check. Returns true if the request came from loopback.
+ */
+function isLocalRequest(req) {
+    const ip = req.socket.remoteAddress;
+    if (!ip)
+        return false;
+    return (ip === '127.0.0.1' ||
+        ip === '::1' ||
+        ip === '::ffff:127.0.0.1');
+}
+/** Reject non-local callers with 403. Returns true if request should continue. */
+function enforceLocalOnly(req, res) {
+    if (!isLocalRequest(req)) {
+        res.status(403).json({
+            error: 'forbidden',
+            detail: 'skills/distill is local-only (loopback access required)',
+        });
+        return false;
+    }
+    return true;
+}
+/**
+ * Count candidate markdown files in the upstream cache.
+ */
+async function countCandidates(cacheRoot) {
+    if (!fs.existsSync(cacheRoot))
+        return 0;
+    let total = 0;
+    const walk = (dir, depth) => {
+        if (depth > 4)
+            return;
+        let entries = [];
+        try {
+            entries = fs.readdirSync(dir, { withFileTypes: true });
+        }
+        catch {
+            return;
+        }
+        for (const e of entries) {
+            const full = path.join(dir, e.name);
+            if (e.isDirectory()) {
+                if (e.name === '.git' || e.name === 'node_modules')
+                    continue;
+                walk(full, depth + 1);
+            }
+            else if (e.isFile() && e.name.endsWith('.md')) {
+                total++;
+            }
+        }
+    };
+    walk(cacheRoot, 0);
+    return total;
+}
+export function registerSkillsDistillRoutes(app, _ctx) {
+    // ── GET /api/skills/distill/status ─────────────────────────────────────────
+    app.get('/api/skills/distill/status', async (req, res) => {
+        if (!enforceLocalOnly(req, res))
+            return;
+        try {
+            const state = await readDistillState();
+            const exists = state !== null || (await distillStateExists());
+            const current = distillManager.getCurrent();
+            const last = distillManager.getLastFinished();
+            // spec 1851 R-B: real claude CLI presence check via PATH probe
+            // (cached for 5 min inside findClaudeBin). UI gates the
+            // "Distill now" button on this flag.
+            const claudeBin = findClaudeBin();
+            // Spec 0930: surface any stub-fallback / empty-body fossils so the UI
+            // can prompt the user to re-distill them. Scan is cheap (12 files
+            // ~5KB each = <1ms walk) so we do it on every /status poll.
+            let stubs = [];
+            try {
+                stubs = await listStubTopics();
+            }
+            catch (stubErr) {
+                logger.warn(`[skills-distill] /status stub scan failed: ${stubErr}`);
+            }
+            res.json({
+                stateFileExists: exists,
+                state,
+                isBusy: distillManager.isBusy(),
+                currentRunId: current?.runId ?? null,
+                lastRunId: last?.runId ?? null,
+                claudeCliAvailable: claudeBin !== null,
+                claudeCliPath: claudeBin,
+                stubs,
+            });
+        }
+        catch (err) {
+            logger.warn(`[skills-distill] /status failed: ${err}`);
+            res.status(500).json({ error: 'status_failed', detail: String(err) });
+        }
+    });
+    // ── GET /api/skills/distill/cost-estimate ──────────────────────────────────
+    app.get('/api/skills/distill/cost-estimate', async (req, res) => {
+        if (!enforceLocalOnly(req, res))
+            return;
+        try {
+            const parsed = parseInt(String(req.query.topicCap ?? '5'), 10);
+            const topicCap = Math.min(50, Math.max(1, Number.isFinite(parsed) ? parsed : 5));
+            const state = await readDistillState();
+            const cacheRoot = state?.cacheRoot ?? path.join(process.env.HOME ?? '~', '.claude-forge', 'skills-cache');
+            const candidateCount = await countCandidates(cacheRoot);
+            const estimate = estimateTokens({ candidateCount, topicCap });
+            res.json({
+                candidateCount,
+                topicCap,
+                ...estimate,
+            });
+        }
+        catch (err) {
+            logger.warn(`[skills-distill] /cost-estimate failed: ${err}`);
+            res.status(500).json({ error: 'cost_estimate_failed', detail: String(err) });
+        }
+    });
+    // ── GET /api/skills/distill/review ─────────────────────────────────────────
+    app.get('/api/skills/distill/review', async (req, res) => {
+        if (!enforceLocalOnly(req, res))
+            return;
+        try {
+            const summary = await distillReview();
+            res.json(summary);
+        }
+        catch (err) {
+            logger.warn(`[skills-distill] /review failed: ${err}`);
+            res.status(500).json({ error: 'review_failed', detail: String(err) });
+        }
+    });
+    // ── GET /api/skills/distill/review/:topicId/diff ──────────────────────────
+    app.get('/api/skills/distill/review/:topicId/diff', async (req, res) => {
+        if (!enforceLocalOnly(req, res))
+            return;
+        const { topicId } = req.params;
+        if (!TOPIC_ID_RE.test(topicId) || topicId.length > 100) {
+            res.status(400).json({ error: 'invalid_topic_id' });
+            return;
+        }
+        try {
+            // spec 3d91839c: route through binary-paths so daemon launchd (cwd=/)
+            // can still find files in `<binaryRoot>/skills/distilled/`. The cwd-
+            // anchored path is kept by `getDistilledOutputDirCandidates` as a
+            // legacy fallback for users running `cf` from the repo root.
+            const outputDir = resolveDistilledOutputDir();
+            if (!outputDir) {
+                logger.warn(`[skills-distill] /review/:topicId/diff no distilled output dir; tried: ${getDistilledOutputDirCandidates().join(', ')}`);
+                res.status(404).json({ error: 'distilled_file_not_found', topicId });
+                return;
+            }
+            const candidates = [
+                path.join(outputDir, `${topicId}.md`),
+                path.join(outputDir, `distilled-${topicId}.md`),
+            ];
+            const filePath = candidates.find((p) => fs.existsSync(p));
+            if (!filePath) {
+                res.status(404).json({ error: 'distilled_file_not_found', topicId });
+                return;
+            }
+            const raw = fs.readFileSync(filePath, 'utf-8');
+            const parsed = matter(raw);
+            const upstreams = [];
+            const distilledFrom = parsed.data['distilled_from'] ?? [];
+            const state = await readDistillState();
+            const cacheRoot = state?.cacheRoot ?? path.join(process.env.HOME ?? '~', '.claude-forge', 'skills-cache');
+            for (const source of distilledFrom) {
+                const relPath = source.paths?.[0];
+                if (!relPath)
+                    continue;
+                let content = null;
+                let foundPath = '';
+                try {
+                    const subdirs = fs.readdirSync(cacheRoot, { withFileTypes: true });
+                    for (const sd of subdirs) {
+                        if (!sd.isDirectory())
+                            continue;
+                        const tryPath = path.join(cacheRoot, sd.name, relPath);
+                        if (fs.existsSync(tryPath)) {
+                            content = fs.readFileSync(tryPath, 'utf-8');
+                            foundPath = tryPath;
+                            break;
+                        }
+                    }
+                }
+                catch {
+                    // ignore — upstream not in cache anymore
+                }
+                upstreams.push({
+                    upstream: source.upstream,
+                    path: foundPath || relPath,
+                    content,
+                });
+            }
+            res.json({
+                topicId,
+                filePath,
+                distilledMarkdown: parsed.content,
+                frontmatter: parsed.data,
+                upstreams,
+            });
+        }
+        catch (err) {
+            logger.warn(`[skills-distill] /review/:topicId/diff failed: ${err}`);
+            res.status(500).json({ error: 'diff_failed', detail: String(err) });
+        }
+    });
+    // ── GET /api/skills/distill/run/:runId/stream  (SSE) ──────────────────────
+    app.get('/api/skills/distill/run/:runId/stream', (req, res) => {
+        if (!enforceLocalOnly(req, res))
+            return;
+        const { runId } = req.params;
+        const session = distillManager.getSession(runId);
+        if (!session) {
+            res.status(404).json({ error: 'unknown_run_id' });
+            return;
+        }
+        res.writeHead(200, {
+            'Content-Type': 'text/event-stream',
+            'Cache-Control': 'no-cache',
+            Connection: 'keep-alive',
+            'X-Accel-Buffering': 'no',
+        });
+        res.write('event: connected\ndata: {}\n\n');
+        const heartbeatInterval = setInterval(() => {
+            if (!res.writableEnded) {
+                try {
+                    res.write(':heartbeat\n\n');
+                }
+                catch {
+                    /* client gone */
+                }
+            }
+        }, 30_000);
+        heartbeatInterval.unref?.();
+        for (const ev of session.events) {
+            res.write(`event: ${ev.type}\ndata: ${JSON.stringify(ev)}\n\n`);
+        }
+        if (session.doneAt != null) {
+            clearInterval(heartbeatInterval);
+            res.end();
+            return;
+        }
+        const send = (ev) => {
+            try {
+                res.write(`event: ${ev.type}\ndata: ${JSON.stringify(ev)}\n\n`);
+                if (ev.type === 'done' ||
+                    ev.type === 'error' ||
+                    ev.type === 'cancelled') {
+                    clearInterval(heartbeatInterval);
+                    res.end();
+                }
+            }
+            catch (err) {
+                clearInterval(heartbeatInterval);
+                logger.warn(`[skills-distill] SSE write failed: ${err}`);
+            }
+        };
+        const unsubscribe = distillManager.subscribe(runId, send);
+        req.on('close', () => {
+            clearInterval(heartbeatInterval);
+            unsubscribe();
+        });
+    });
+    // ── POST /api/skills/distill/init ─────────────────────────────────────────
+    app.post('/api/skills/distill/init', async (req, res) => {
+        if (!enforceLocalOnly(req, res))
+            return;
+        try {
+            const body = (req.body ?? {});
+            const r = await distillInit({ skipFetch: body.skipFetch === true });
+            res.json(r);
+        }
+        catch (err) {
+            logger.warn(`[skills-distill] /init failed: ${err}`);
+            res.status(500).json({ error: 'init_failed', detail: String(err) });
+        }
+    });
+    // ── POST /api/skills/distill/run ──────────────────────────────────────────
+    app.post('/api/skills/distill/run', async (req, res) => {
+        if (!enforceLocalOnly(req, res))
+            return;
+        try {
+            const body = (req.body ?? {});
+            // R-A: no API key dependency; the run goes through the stub distillGroup.
+            const topicCap = typeof body.topicCap === 'number' && body.topicCap >= 1 && body.topicCap <= 50
+                ? Math.floor(body.topicCap)
+                : undefined;
+            const skip = Array.isArray(body.skip)
+                ? body.skip.filter((s) => typeof s === 'string' && TOPIC_ID_RE.test(s))
+                : undefined;
+            const regenerateAll = body.regenerateAll === true;
+            // Spec 0930: accept explicit topicIds (filtered by TOPIC_ID_RE) and
+            // force flag to re-distill specific topics regardless of completedSet
+            // / topicCap.
+            const topicIds = Array.isArray(body.topicIds)
+                ? body.topicIds.filter((s) => typeof s === 'string' && TOPIC_ID_RE.test(s))
+                : undefined;
+            // Spec 1641: accept outputIds (must match `distilled-<slug>` so the
+            // caller cannot smuggle path traversal or arbitrary filenames through).
+            // When both topicIds and outputIds are non-empty, the orchestrator
+            // picks outputIds (Q2) — that decision is enforced inside distillRun,
+            // we just forward what the user sent.
+            const outputIds = Array.isArray(body.outputIds)
+                ? body.outputIds.filter((s) => typeof s === 'string' && OUTPUT_ID_RE.test(s))
+                : undefined;
+            const force = body.force === true;
+            const { runId } = distillManager.start({
+                topicCap,
+                skip,
+                regenerateAll,
+                topicIds,
+                outputIds,
+                force,
+            });
+            res.status(202).json({
+                runId,
+                streamUrl: `/api/skills/distill/run/${runId}/stream`,
+            });
+        }
+        catch (err) {
+            if (err instanceof DistillConflictError) {
+                res.status(409).json({ error: 'distill_in_progress', detail: err.message });
+                return;
+            }
+            logger.warn(`[skills-distill] /run failed: ${err}`);
+            res.status(500).json({ error: 'run_failed', detail: String(err) });
+        }
+    });
+    // ── POST /api/skills/distill/redistill-stubs ──────────────────────────────
+    // Spec 0930: one-shot convenience — scan output dir for stub-fallback /
+    // empty-body fossils and kick off a forced re-distill in a single request.
+    // Avoids round-tripping `/status` -> `/run { ..., force }` from the UI.
+    //
+    // Spec 1641: switched from `topicIds` to `outputIds`. The old topic-id
+    // round-trip lost precision when one topic group contained multiple
+    // outputs (e.g. `writing-plans` AND `executing-plans` both canonicalize
+    // to topic `plan`) — the orchestrator picked the highest-scored sibling
+    // and wrote ITS file, leaving the broken file untouched. With outputIds
+    // each broken file is repaired by name. `topicIds` is kept in the
+    // response for back-compat (deprecated).
+    app.post('/api/skills/distill/redistill-stubs', async (req, res) => {
+        if (!enforceLocalOnly(req, res))
+            return;
+        try {
+            const stubs = await listStubTopics();
+            if (stubs.length === 0) {
+                res.status(200).json({ message: 'no stubs detected' });
+                return;
+            }
+            const outputIds = stubs.map(s => s.outputId);
+            const topicIds = Array.from(new Set(stubs.map(s => s.topicId))); // deprecated, kept for UI back-compat
+            const { runId } = distillManager.start({
+                outputIds,
+                force: true,
+            });
+            res.status(202).json({
+                runId,
+                streamUrl: `/api/skills/distill/run/${runId}/stream`,
+                stubs,
+                outputIds,
+                /** @deprecated spec 1641 — the run keys off outputIds; this field is for UI back-compat only. */
+                topicIds,
+            });
+        }
+        catch (err) {
+            if (err instanceof DistillConflictError) {
+                res.status(409).json({ error: 'distill_in_progress', detail: err.message });
+                return;
+            }
+            logger.warn(`[skills-distill] /redistill-stubs failed: ${err}`);
+            res.status(500).json({ error: 'redistill_stubs_failed', detail: String(err) });
+        }
+    });
+    // ── POST /api/skills/distill/run/:runId/continue ──────────────────────────
+    // R-A: kept for UI back-compat; just starts a fresh stub run.
+    app.post('/api/skills/distill/run/:runId/continue', async (req, res) => {
+        if (!enforceLocalOnly(req, res))
+            return;
+        try {
+            const { runId } = distillManager.start({});
+            res.status(202).json({
+                runId,
+                streamUrl: `/api/skills/distill/run/${runId}/stream`,
+            });
+        }
+        catch (err) {
+            if (err instanceof DistillConflictError) {
+                res.status(409).json({ error: 'distill_in_progress', detail: err.message });
+                return;
+            }
+            logger.warn(`[skills-distill] /run/:runId/continue failed: ${err}`);
+            res.status(500).json({ error: 'continue_failed', detail: String(err) });
+        }
+    });
+    // ── POST /api/skills/distill/refresh ──────────────────────────────────────
+    app.post('/api/skills/distill/refresh', async (req, res) => {
+        if (!enforceLocalOnly(req, res))
+            return;
+        try {
+            await distillInit({});
+            const { runId } = distillManager.start({});
+            res.status(202).json({
+                runId,
+                streamUrl: `/api/skills/distill/run/${runId}/stream`,
+            });
+        }
+        catch (err) {
+            if (err instanceof DistillConflictError) {
+                res.status(409).json({ error: 'distill_in_progress', detail: err.message });
+                return;
+            }
+            logger.warn(`[skills-distill] /refresh failed: ${err}`);
+            res.status(500).json({ error: 'refresh_failed', detail: String(err) });
+        }
+    });
+    // ── POST /api/skills/distill/apply/:topicId ───────────────────────────────
+    app.post('/api/skills/distill/apply/:topicId', async (req, res) => {
+        if (!enforceLocalOnly(req, res))
+            return;
+        const { topicId } = req.params;
+        if (!TOPIC_ID_RE.test(topicId) || topicId.length > 100) {
+            res.status(400).json({ error: 'invalid_topic_id' });
+            return;
+        }
+        try {
+            // spec 3d91839c: same binary-paths resolution as /review/:topicId/diff
+            // so the daemon can serve apply requests even when its cwd is `/`.
+            const outputDir = resolveDistilledOutputDir();
+            if (!outputDir) {
+                logger.warn(`[skills-distill] /apply/:topicId no distilled output dir; tried: ${getDistilledOutputDirCandidates().join(', ')}`);
+                res.status(404).json({ error: 'distilled_file_not_found', topicId });
+                return;
+            }
+            const candidates = [
+                path.join(outputDir, `${topicId}.md`),
+                path.join(outputDir, `distilled-${topicId}.md`),
+            ];
+            const filePath = candidates.find((p) => fs.existsSync(p));
+            if (!filePath) {
+                res.status(404).json({ error: 'distilled_file_not_found', topicId });
+                return;
+            }
+            const { execFile } = await import('node:child_process');
+            const { promisify } = await import('node:util');
+            const exec = promisify(execFile);
+            try {
+                // NOTE: `cwd: process.cwd()` is intentionally kept here — git needs
+                // a working tree to run `git status` against. The daemon under
+                // launchd may have cwd=/, in which case git status will likely fail
+                // (caught below); that's an acceptable fallback for a non-dev env.
+                const result = await exec('git', ['status', '--porcelain', filePath], {
+                    cwd: process.cwd(),
+                    timeout: 10_000,
+                });
+                const porcelain = result.stdout.trim();
+                res.json({
+                    topicId,
+                    filePath,
+                    gitStatus: porcelain || 'clean',
+                    hint: porcelain
+                        ? `Run 'git add ${filePath} && git commit' to commit the distilled skill.`
+                        : 'Already committed (clean tree).',
+                });
+            }
+            catch (gitErr) {
+                res.json({
+                    topicId,
+                    filePath,
+                    gitStatus: 'unknown (git unavailable)',
+                    hint: 'File exists; manual commit via your VCS of choice.',
+                    gitError: gitErr instanceof Error ? gitErr.message : String(gitErr),
+                });
+            }
+        }
+        catch (err) {
+            logger.warn(`[skills-distill] /apply/:topicId failed: ${err}`);
+            res.status(500).json({ error: 'apply_failed', detail: String(err) });
+        }
+    });
+    // ── POST /api/skills/distill/cancel/:runId ────────────────────────────────
+    app.post('/api/skills/distill/cancel/:runId', (req, res) => {
+        if (!enforceLocalOnly(req, res))
+            return;
+        const { runId } = req.params;
+        const ok = distillManager.cancel(runId);
+        if (!ok) {
+            res.status(404).json({ error: 'unknown_run_id_or_already_finished' });
+            return;
+        }
+        res.json({ cancelled: true, runId });
+    });
+    // Touch DEFAULT_STATE_PATH so tree-shake doesn't drop the import.
+    void DEFAULT_STATE_PATH;
+}
+//# sourceMappingURL=skills-distill.js.map

package/dist/web/routes/skills-distill.js.map

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

package/dist/web/routes/skills.js

@@ -11,7 +11,7 @@ import { FORGE_PATHS } from '../../core/constants.js';
  */
 export function registerSkillsRoutes(app, ctx) {
     const skillRegistry = ctx.skillRegistry;
-    // GET /api/skills — list all skills (official + user; supports flat & directory formats)
+    // GET /api/skills — list all skills (builtin + user; supports flat & directory formats)
     app.get('/api/skills', (_req, res) => {
         try {
             if (skillRegistry) {
@@ -22,8 +22,8 @@ export function registerSkillsRoutes(app, ctx) {
                     description: s.description ?? '',
                     keywords: s.keywords,
                     path: s.path,
-                    isOfficial: s.isOfficial === true,
-                    source: s.isOfficial ? 'official' : 'user',
+                    isBuiltin: s.isBuiltin === true,
+                    source: s.isBuiltin ? 'builtin' : 'user',
                 }));
                 res.json({ skills });
                 return;
@@ -66,7 +66,7 @@ export function registerSkillsRoutes(app, ctx) {
                             description,
                             keywords,
                             path: filePath,
-                            isOfficial: false,
+                            isBuiltin: false,
                             source: 'user',
                         });
                     }
@@ -100,8 +100,8 @@ export function registerSkillsRoutes(app, ctx) {
                             id: skill.id,
                             description: skill.description ?? '',
                             keywords: skill.keywords,
-                            isOfficial: true,
-                            source: 'official',
+                            isBuiltin: true,
+                            source: 'builtin',
                             content: skill.content,
                         });
                         return;
@@ -114,7 +114,7 @@ export function registerSkillsRoutes(app, ctx) {
                             id: skill.id,
                             description: skill.description ?? '',
                             keywords: skill.keywords,
-                            isOfficial: false,
+                            isBuiltin: false,
                             source: 'user',
                             path: skill.path,
                             content,