umbrella-context 0.1.37 → 0.1.39

package/dist/commands/hub.js

@@ -2,59 +2,8 @@ import { randomUUID } from "crypto";
 import chalk from "chalk";
 import prompts from "prompts";
 import { configManager } from "../config.js";
-import { getInstalledHubEntries, getSessionState, recordSessionEvent, recordSessionHubEntry, setInstalledHubEntries, setSessionPanel, writeHubAsset, writeHubAssetFiles } from "../repo-state.js";
+import { getInstalledHubEntries, getSessionState, recordSessionEvent, recordSessionHubEntry, setInstalledHubEntries, setSessionPanel, writeHubAsset, writeHubAssetFiles, } from "../repo-state.js";
 import { connectorsCommandAction } from "./connectors.js";
-async function runHubBrowseFlow() {
-    const answer = await prompts({
-        type: "select",
-        name: "value",
-        message: "Choose a hub entry to browse",
-        choices: DEFAULT_HUB_ENTRIES.map((entry) => ({
-            title: `${entry.name} (${entry.type})`,
-            description: entry.description,
-            value: entry.slug,
-        })),
-    });
-    if (!answer.value) {
-        console.log(chalk.yellow("\n No hub entry selected."));
-        return;
-    }
-    const inspectResult = await hubCommandAction("inspect", answer.value);
-    if (!inspectResult?.installedEntry)
-        return;
-    const next = await prompts({
-        type: "select",
-        name: "value",
-        message: `What do you want to do with ${inspectResult.installedEntry.name}?`,
-        choices: [
-            { title: "Install it into this repo", value: "install" },
-            ...(inspectResult.recommendedConnector
-                ? [{ title: `Install and run ${inspectResult.recommendedConnector}`, value: "connector" }]
-                : []),
-            { title: "Back", value: "back" },
-        ],
-    });
-    if (!next.value || next.value === "back") {
-        return {
-            action: "browse",
-            changed: false,
-            installedEntry: inspectResult.installedEntry,
-            recommendedConnector: inspectResult.recommendedConnector,
-        };
-    }
-    const installResult = await hubCommandAction("install", inspectResult.installedEntry.slug);
-    if (next.value === "connector" && inspectResult.recommendedConnector) {
-        await connectorsCommandAction("run", inspectResult.recommendedConnector);
-    }
-    return {
-        action: "browse",
-        changed: Boolean(installResult?.changed),
-        installedEntry: installResult?.installedEntry ?? inspectResult.installedEntry,
-        assetPath: installResult?.assetPath,
-        filePaths: installResult?.filePaths,
-        recommendedConnector: inspectResult.recommendedConnector,
-    };
-}
 const DEFAULT_HUB_ENTRIES = [
     {
         slug: "quick-ping-growth-bundle",
@@ -93,8 +42,108 @@ const DEFAULT_HUB_ENTRIES = [
         installsConnector: "codex-mcp",
     },
 ];
-export function listHubRegistryEntries() {
-    return [...DEFAULT_HUB_ENTRIES];
+function normalizeRemoteHubEntry(raw, registry) {
+    if (!raw.slug || !raw.name) {
+        return null;
+    }
+    if (raw.type !== "bundle" && raw.type !== "skill" && raw.type !== "connector") {
+        return null;
+    }
+    return {
+        slug: raw.slug,
+        name: raw.name,
+        type: raw.type,
+        description: raw.description ?? "No description provided.",
+        includes: Array.isArray(raw.includes) ? raw.includes : [],
+        nextSteps: Array.isArray(raw.nextSteps) ? raw.nextSteps : [],
+        installsConnector: raw.installsConnector,
+        registryName: registry.name,
+        registryUrl: registry.url,
+    };
+}
+function buildRegistryHeaders(registry) {
+    const token = registry.token?.trim();
+    const scheme = registry.authScheme ?? "none";
+    if (!token || scheme === "none") {
+        return undefined;
+    }
+    if (scheme === "bearer") {
+        return { Authorization: `Bearer ${token}` };
+    }
+    if (scheme === "token") {
+        return { Authorization: `Token ${token}` };
+    }
+    if (scheme === "basic") {
+        return { Authorization: `Basic ${token}` };
+    }
+    if (scheme === "custom-header") {
+        return { [registry.headerName?.trim() || "X-Registry-Token"]: token };
+    }
+    return undefined;
+}
+async function fetchRegistryStatus(registry) {
+    if (registry.url.startsWith("https://hub.umbrella.local/")) {
+        return {
+            registry,
+            status: "ok",
+            entryCount: DEFAULT_HUB_ENTRIES.length,
+            entries: DEFAULT_HUB_ENTRIES.map((entry) => ({
+                ...entry,
+                registryName: registry.name,
+                registryUrl: registry.url,
+            })),
+        };
+    }
+    try {
+        const response = await fetch(registry.url, {
+            headers: buildRegistryHeaders(registry),
+        });
+        if (!response.ok) {
+            return {
+                registry,
+                status: "error",
+                entryCount: 0,
+                error: `HTTP ${response.status}`,
+                entries: [],
+            };
+        }
+        const payload = (await response.json());
+        const entries = (payload.entries ?? [])
+            .map((entry) => normalizeRemoteHubEntry(entry, registry))
+            .filter((entry) => Boolean(entry));
+        return {
+            registry,
+            status: "ok",
+            entryCount: entries.length,
+            entries,
+        };
+    }
+    catch (error) {
+        return {
+            registry,
+            status: "error",
+            entryCount: 0,
+            error: error instanceof Error ? error.message : "Unknown error",
+            entries: [],
+        };
+    }
+}
+async function getHubCatalog() {
+    const statuses = await Promise.all(configManager.hubRegistries.map((registry) => fetchRegistryStatus(registry)));
+    const deduped = new Map();
+    for (const entry of statuses.flatMap((status) => status.entries)) {
+        if (!deduped.has(entry.slug)) {
+            deduped.set(entry.slug, entry);
+        }
+    }
+    return {
+        statuses,
+        entries: [...deduped.values()],
+    };
+}
+export async function listHubRegistryEntries() {
+    const { entries } = await getHubCatalog();
+    return entries;
 }
 function buildHubAsset(entry) {
     return [
@@ -102,6 +151,7 @@ function buildHubAsset(entry) {
         "",
         `Type: ${entry.type}`,
         `Slug: ${entry.slug}`,
+        `Registry: ${entry.registryName ?? "Umbrella Hub"}`,
         "",
         "## Why this exists",
         "",
@@ -246,22 +296,86 @@ function printInstalled(installed) {
         console.log(chalk.gray(`    Installed from ${entry.registryName} at ${new Date(entry.installedAt).toLocaleString()}`));
     });
 }
-function printRegistryList() {
+function printRegistryList(statuses) {
     console.log(chalk.bold("\n Hub Registries\n"));
-    configManager.hubRegistries.forEach((registry, index) => {
+    statuses.forEach(({ registry, status, entryCount, error }, index) => {
+        const authLabel = registry.authScheme && registry.authScheme !== "none"
+            ? ` [${registry.authScheme}]`
+            : "";
+        const tokenLabel = registry.token ? " (authenticated)" : "";
+        const statusLabel = status === "ok"
+            ? `${entryCount} entr${entryCount === 1 ? "y" : "ies"}`
+            : `error: ${error ?? "unknown"}`;
         console.log(` ${index + 1}. ${registry.name}`);
-        console.log(chalk.gray(`    ${registry.url}`));
+        console.log(chalk.gray(`    ${registry.url}${authLabel}${tokenLabel}`));
+        console.log(chalk.gray(`    ${statusLabel}`));
     });
 }
+async function runHubBrowseFlow() {
+    const { entries } = await getHubCatalog();
+    const answer = await prompts({
+        type: "select",
+        name: "value",
+        message: "Choose a hub entry to browse",
+        choices: entries.map((entry) => ({
+            title: `${entry.name} (${entry.type})`,
+            description: entry.registryName ? `${entry.description} [${entry.registryName}]` : entry.description,
+            value: entry.slug,
+        })),
+    });
+    if (!answer.value) {
+        console.log(chalk.yellow("\n No hub entry selected."));
+        return;
+    }
+    const inspectResult = await hubCommandAction("inspect", answer.value);
+    if (!inspectResult?.installedEntry)
+        return;
+    const next = await prompts({
+        type: "select",
+        name: "value",
+        message: `What do you want to do with ${inspectResult.installedEntry.name}?`,
+        choices: [
+            { title: "Install it into this repo", value: "install" },
+            ...(inspectResult.recommendedConnector
+                ? [{ title: `Install and run ${inspectResult.recommendedConnector}`, value: "connector" }]
+                : []),
+            { title: "Back", value: "back" },
+        ],
+    });
+    if (!next.value || next.value === "back") {
+        return {
+            action: "browse",
+            changed: false,
+            installedEntry: inspectResult.installedEntry,
+            recommendedConnector: inspectResult.recommendedConnector,
+        };
+    }
+    const installResult = await hubCommandAction("install", inspectResult.installedEntry.slug);
+    if (next.value === "connector" && inspectResult.recommendedConnector) {
+        await connectorsCommandAction("run", inspectResult.recommendedConnector);
+    }
+    return {
+        action: "browse",
+        changed: Boolean(installResult?.changed),
+        installedEntry: installResult?.installedEntry ?? inspectResult.installedEntry,
+        assetPath: installResult?.assetPath,
+        filePaths: installResult?.filePaths,
+        recommendedConnector: inspectResult.recommendedConnector,
+    };
+}
 export async function hubCommandAction(action, subAction) {
     const normalized = action.toLowerCase();
     await setSessionPanel("hub", subAction ?? normalized);
     if (normalized === "list") {
         await setSessionPanel("hub", "list");
+        const { entries } = await getHubCatalog();
         console.log(chalk.bold("\n Hub Catalog\n"));
-        DEFAULT_HUB_ENTRIES.forEach((entry, index) => {
+        entries.forEach((entry, index) => {
             console.log(` ${index + 1}. ${entry.name} [${entry.type}]`);
             console.log(chalk.gray(`    ${entry.description}`));
+            if (entry.registryName) {
+                console.log(chalk.gray(`    Source: ${entry.registryName}`));
+            }
         });
         const installed = await getInstalledHubEntries();
         if (installed.length > 0) {
@@ -274,20 +388,21 @@ export async function hubCommandAction(action, subAction) {
         return runHubBrowseFlow();
     }
     if (normalized === "install") {
+        const { entries } = await getHubCatalog();
         const installed = await getInstalledHubEntries();
-        let selected = subAction ? DEFAULT_HUB_ENTRIES.find((entry) => entry.slug === subAction) : undefined;
+        let selected = subAction ? entries.find((entry) => entry.slug === subAction) : undefined;
         if (!selected) {
             const answer = await prompts({
                 type: "select",
                 name: "value",
                 message: "Choose a hub entry to install into this repo",
-                choices: DEFAULT_HUB_ENTRIES.map((entry) => ({
+                choices: entries.map((entry) => ({
                     title: `${entry.name} (${entry.type})`,
-                    description: entry.description,
+                    description: entry.registryName ? `${entry.description} [${entry.registryName}]` : entry.description,
                     value: entry.slug,
                 })),
             });
-            selected = DEFAULT_HUB_ENTRIES.find((entry) => entry.slug === answer.value);
+            selected = entries.find((entry) => entry.slug === answer.value);
         }
         if (!selected) {
             console.log(chalk.yellow("\n No hub entry selected."));
@@ -311,7 +426,6 @@ export async function hubCommandAction(action, subAction) {
                 installedEntry: selected,
             };
         }
-        const registry = configManager.hubRegistries[0];
         await setInstalledHubEntries([
             ...installed,
             {
@@ -321,7 +435,7 @@ export async function hubCommandAction(action, subAction) {
                 type: selected.type,
                 description: selected.description,
                 installedAt: new Date().toISOString(),
-                registryName: registry?.name ?? "Umbrella Hub",
+                registryName: selected.registryName ?? "Umbrella Hub",
             },
         ]);
         const assetPath = await writeHubAsset(selected.slug, buildHubAsset(selected));
@@ -353,9 +467,8 @@ export async function hubCommandAction(action, subAction) {
         };
     }
     if (normalized === "inspect") {
-        const target = subAction
-            ? DEFAULT_HUB_ENTRIES.find((entry) => entry.slug === subAction)
-            : undefined;
+        const { entries } = await getHubCatalog();
+        const target = subAction ? entries.find((entry) => entry.slug === subAction) : undefined;
         if (!target) {
             console.log(chalk.red("Use: hub inspect <slug>"));
             return;
@@ -376,6 +489,7 @@ export async function hubCommandAction(action, subAction) {
         console.log(` Type: ${target.type}`);
         console.log(` Slug: ${target.slug}`);
         console.log(` Installed: ${isInstalled ? "Yes" : "No"}`);
+        console.log(` Registry: ${target.registryName ?? "Umbrella Hub"}`);
         console.log(chalk.gray(` ${target.description}`));
         console.log("");
         console.log(chalk.cyan(" Includes"));
@@ -417,13 +531,38 @@ export async function hubCommandAction(action, subAction) {
         await setSessionPanel("hub", `registry:${subAction ?? "list"}`);
         const mode = (subAction ?? "list").toLowerCase();
         if (mode === "list") {
-            printRegistryList();
+            const { statuses } = await getHubCatalog();
+            printRegistryList(statuses);
             return { action: "registry", changed: false };
         }
         if (mode === "add") {
             const answer = await prompts([
                 { type: "text", name: "name", message: "Registry name" },
                 { type: "text", name: "url", message: "Registry URL" },
+                {
+                    type: "select",
+                    name: "authScheme",
+                    message: "Authentication",
+                    choices: [
+                        { title: "No auth", value: "none" },
+                        { title: "Bearer token", value: "bearer" },
+                        { title: "Token header", value: "token" },
+                        { title: "Basic header", value: "basic" },
+                        { title: "Custom header", value: "custom-header" },
+                    ],
+                    initial: 0,
+                },
+                {
+                    type: (_prev, values) => values.authScheme && values.authScheme !== "none" ? "password" : null,
+                    name: "token",
+                    message: "Registry token",
+                },
+                {
+                    type: (_prev, values) => values.authScheme === "custom-header" ? "text" : null,
+                    name: "headerName",
+                    message: "Custom header name",
+                    initial: "X-Registry-Token",
+                },
             ]);
             if (!answer.name || !answer.url) {
                 console.log(chalk.yellow("\n Registry add cancelled."));
@@ -433,6 +572,9 @@ export async function hubCommandAction(action, subAction) {
                 id: randomUUID(),
                 name: answer.name,
                 url: answer.url,
+                authScheme: answer.authScheme ?? "none",
+                token: answer.token || undefined,
+                headerName: answer.headerName || undefined,
                 updatedAt: new Date().toISOString(),
             });
             await recordSessionEvent({
@@ -444,6 +586,14 @@ export async function hubCommandAction(action, subAction) {
                 status: "success",
             });
             console.log(chalk.green(`\n Added registry ${answer.name}.`));
+            const { statuses } = await getHubCatalog();
+            const addedStatus = statuses.find((status) => status.registry.url === answer.url);
+            if (addedStatus?.status === "ok") {
+                console.log(chalk.gray(` Found ${addedStatus.entryCount} hub entr${addedStatus.entryCount === 1 ? "y" : "ies"} immediately.`));
+            }
+            else if (addedStatus?.error) {
+                console.log(chalk.yellow(` Registry saved, but the first fetch failed: ${addedStatus.error}`));
+            }
             return { action: "registry", changed: true };
         }
         if (mode === "remove") {

package/dist/commands/interactive.js

@@ -46,7 +46,7 @@ function printWelcomeHeader(providerLabel, modelLabel) {
     console.log(`  ${chalk.yellow("/reset")}        Reset this repo's local Context state`);
     console.log(`  ${chalk.yellow("/")}             Full command list`);
     console.log(divider());
-    console.log(`  ${chalk.gray("Shortcuts:")} type plain text to query, or start with ${chalk.yellow("+")} to curate quickly.`);
+    console.log(`  ${chalk.gray("Shortcuts:")} start with ${chalk.yellow("?")} to query, or start with ${chalk.yellow("+")} to curate quickly.`);
     console.log("");
 }
 async function printRuntimeSnapshot() {
@@ -794,7 +794,7 @@ export async function interactiveCommand(_args) {
     await setSessionPanel("home", configManager.config.projectName);
     await printRuntimeSnapshot();
     await printHomeView(configManager.config);
-    console.log(chalk.gray(" Type / to see commands. Use plain text to query or start with + to curate.\n"));
+    console.log(chalk.gray(" Type / to see commands. Use ? to query or + to curate.\n"));
     while (true) {
         const currentConfig = configManager.config;
         if (!currentConfig) {
@@ -837,21 +837,32 @@ export async function interactiveCommand(_args) {
             }
             continue;
         }
-        const { command, args } = parseInteractiveInput(raw);
-        const spec = resolveCommand(command);
-        if (!raw.startsWith("/") && !spec) {
-            commandHistory.push(`/query ${raw}`);
-            await recordSessionCommand(`/query ${raw}`);
-            await recordSessionQuery(raw);
-            await setSessionSummary(`Queried Context: ${raw.length > 48 ? `${raw.slice(0, 48)}...` : raw}`);
+        if (raw.startsWith("?")) {
+            const query = raw.slice(1).trim();
+            if (!query) {
+                console.log(chalk.yellow("Use ? followed by a real question, for example ? what do we already know about auth timeouts"));
+                continue;
+            }
+            commandHistory.push(`/query ${query}`);
+            await recordSessionCommand(`/query ${query}`);
+            await recordSessionQuery(query);
+            await setSessionSummary(`Queried Context: ${query.length > 48 ? `${query.slice(0, 48)}...` : query}`);
             try {
-                await searchCommandAction(raw);
+                await searchCommandAction(query);
             }
             catch (err) {
                 console.log(chalk.red(`Command failed: ${err.message}`));
             }
             continue;
         }
+        const { command, args } = parseInteractiveInput(raw);
+        const spec = resolveCommand(command);
+        if (!raw.startsWith("/") && !spec) {
+            console.log(chalk.yellow("That text was not run automatically."));
+            console.log(chalk.gray("Use /query <question> or start with ? to search Context."));
+            console.log(chalk.gray("Use /curate <note> or start with + to save something locally."));
+            continue;
+        }
         if (!spec) {
             console.log(chalk.yellow(`Unknown command: ${raw}. Type / to see available commands.`));
             continue;

package/dist/commands/locations.d.ts

@@ -1,2 +1,7 @@
-export declare function locationsCommandAction(): Promise<void>;
+type OutputFormat = "text" | "json";
+export declare function locationsCommandAction(opts?: {
+    format?: OutputFormat;
+    detail?: boolean;
+}): Promise<void>;
 export declare function locationsCommand(cli: any): void;
+export {};

package/dist/commands/locations.js

@@ -1,20 +1,106 @@
 import chalk from "chalk";
+import { promises as fs } from "fs";
+import path from "path";
 import { configManager } from "../config.js";
-export async function locationsCommandAction() {
-    const locations = configManager.locations;
+import { findRepoRoot, getRepoContext } from "../repo-state.js";
+async function getCurrentRepoRoot() {
+    try {
+        const { repoRoot } = await getRepoContext();
+        return repoRoot;
+    }
+    catch {
+        return null;
+    }
+}
+async function summarizeSavedLocations() {
+    const currentRepoRoot = await getCurrentRepoRoot();
+    const storedLocations = configManager.locations;
+    const normalizedLocations = await Promise.all(storedLocations.map(async (location) => {
+        try {
+            const canonicalRepoRoot = await findRepoRoot(location.repoRoot);
+            return canonicalRepoRoot === location.repoRoot ? location : { ...location, repoRoot: canonicalRepoRoot };
+        }
+        catch {
+            return location;
+        }
+    }));
+    const dedupedLocations = Array.from(new Map(normalizedLocations.map((location) => [
+        location.repoRoot,
+        location,
+    ])).values());
+    const locationChanged = dedupedLocations.length !== storedLocations.length
+        || dedupedLocations.some((location, index) => {
+            const original = storedLocations[index];
+            return !original || original.repoRoot !== location.repoRoot;
+        });
+    if (locationChanged) {
+        configManager.replaceLocations(dedupedLocations);
+    }
+    const snapshots = await Promise.all(dedupedLocations.map(async (location) => {
+        const umDir = path.join(location.repoRoot, ".um");
+        const contextFile = path.join(umDir, "context.json");
+        const [umDirStat, contextStat] = await Promise.allSettled([fs.stat(umDir), fs.stat(contextFile)]);
+        const hasUmDir = umDirStat.status === "fulfilled" && umDirStat.value.isDirectory();
+        const hasContextFile = contextStat.status === "fulfilled" && contextStat.value.isFile();
+        return {
+            ...location,
+            isCurrentRepo: currentRepoRoot !== null && currentRepoRoot === location.repoRoot,
+            hasUmDir,
+            hasContextFile,
+            isLinked: hasUmDir && hasContextFile,
+        };
+    }));
+    return snapshots.sort((a, b) => a.repoRoot.localeCompare(b.repoRoot));
+}
+function printLocationsJson(locations) {
+    console.log(JSON.stringify({
+        ok: true,
+        action: "locations",
+        count: locations.length,
+        locations,
+    }, null, 2));
+}
+export async function locationsCommandAction(opts = {}) {
+    const locations = await summarizeSavedLocations();
     if (locations.length === 0) {
+        if (opts.format === "json") {
+            printLocationsJson([]);
+            return;
+        }
         console.log(chalk.yellow("\n No repo locations saved yet."));
         return;
     }
+    if (opts.format === "json") {
+        printLocationsJson(locations);
+        return;
+    }
     console.log(chalk.bold("\n Saved Context Locations\n"));
     locations.forEach((location, index) => {
-        console.log(chalk.cyan(` ${index + 1}. ${location.companyName} / ${location.projectName}`));
+        const badges = [];
+        if (location.isCurrentRepo)
+            badges.push(chalk.green("CURRENT"));
+        if (location.isLinked)
+            badges.push(chalk.cyan("LINKED"));
+        else
+            badges.push(chalk.yellow("SAVED ONLY"));
+        console.log(chalk.cyan(` ${index + 1}. ${location.companyName} / ${location.projectName} ${badges.join(" ")}`));
         console.log(chalk.gray(`    ${location.repoRoot}`));
         console.log(chalk.gray(`    Updated: ${new Date(location.updatedAt).toLocaleString()}`));
+        if (opts.detail) {
+            console.log(chalk.gray(`    .um folder: ${location.hasUmDir ? "Yes" : "No"}`));
+            console.log(chalk.gray(`    .um/context.json: ${location.hasContextFile ? "Yes" : "No"}`));
+        }
     });
 }
 export function locationsCommand(cli) {
-    cli.command("locations", "List repo folders that have been connected on this machine").action(async () => {
-        await locationsCommandAction();
+    cli
+        .command("locations", "List repo folders that have been connected on this machine")
+        .option("--format <format>", "Output format (text or json)")
+        .option("--detail", "Show whether each saved repo still has a linked .um folder and context file")
+        .example("locations")
+        .example("locations --detail")
+        .example("locations --format json")
+        .action(async (opts) => {
+        await locationsCommandAction(opts);
     });
 }

package/dist/commands/mcp.js

@@ -22,11 +22,16 @@ export function mcpCommand(cli) {
                 const data = await res.json();
                 return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
             });
-            server.tool("memory_push", "Save a memory or note to the current context space", { content: z.string().describe("The memory content"), tags: z.array(z.string()).optional() }, async ({ content, tags }) => {
+            server.tool("memory_push", "Save a memory or note to the current context space", {
+                content: z.string().describe("The memory content"),
+                tags: z.array(z.string()).optional(),
+                category: z.enum(["project", "team", "convention", "environment", "preference", "incident", "other"]).optional(),
+                accessLevel: z.enum(["space", "company"]).optional(),
+            }, async ({ content, tags, category, accessLevel }) => {
                 const res = await fetch(`${config.serverUrl}/api/memories`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json", Authorization: `Bearer ${config.apiKey}` },
-                    body: JSON.stringify({ content, tags: tags || [], source: "mcp" }),
+                    body: JSON.stringify({ content, tags: tags || [], category, accessLevel, source: "mcp" }),
                 });
                 const data = await res.json();
                 return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };

package/dist/commands/pull.d.ts

@@ -1,2 +1,7 @@
-export declare function pullCommandAction(): Promise<void>;
+type OutputFormat = "text" | "json";
+export declare function pullCommandAction(opts?: {
+    format?: OutputFormat;
+    dryRun?: boolean;
+}): Promise<void>;
 export declare function pullCommand(cli: any): void;
+export {};