jishushell 0.4.24 → 0.5.15

package/dist/services/capability-health.js.map

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

package/dist/services/capability-registry.d.ts

@@ -0,0 +1,106 @@
+export type CapabilityStatus = "running" | "stopped" | "unknown";
+/**
+ * Single provider entry in the registry. v3.4.x extends the legacy 5-field
+ * shape (instanceId / hostPort / address / path / registered_at) to ~10
+ * fields so the Connections UI can render rich metadata without re-querying
+ * each provider's spec.
+ */
+export interface CapabilityEntry {
+    instanceId: string;
+    name?: string;
+    capability: string;
+    host: string;
+    hostPort: number;
+    path?: string;
+    address: string;
+    protocol: string;
+    visibility?: "external" | "internal" | string;
+    status: CapabilityStatus;
+    lastSeenRunningAt?: string;
+    registeredAt: string;
+    /**
+     * §17 (PR 8) — when present, MCP-binding adapters expose this
+     * capability through the jishushell MCP firewall using the schema
+     * here, instead of letting the upstream MCP package's `tools/list`
+     * descriptions reach the LLM. Copied verbatim from the producing
+     * spec's `provides[].tool_schema` at registerProvider time.
+     */
+    toolSchema?: import("../types.js").ToolSchema;
+    /**
+     * §6 (PR B) — auth config for consumers of this capability. Copied
+     * verbatim from the producing spec's `provides[].auth` at registerProvider
+     * time. Absent = no auth required.
+     */
+    auth?: import("../types.js").AppProvideAuth;
+}
+/**
+ * Legacy shape kept side-by-side during PR 1-3 transition.
+ */
+interface LegacyCapabilityEntry {
+    instanceId: string;
+    hostPort: number;
+    address: string;
+    path?: string;
+    registered_at: string;
+}
+interface CapabilityRegistryFile {
+    /**
+     * v3.4.x new shape: a capability may have multiple providers (e.g. two
+     * Ollama instances). UI lets users pick among candidates.
+     */
+    providersByCapability?: Record<string, CapabilityEntry[]>;
+    /**
+     * Legacy shape: single entry per capability, last-writer-wins. PR 1 keeps
+     * it dual-written; PR 3 removes it.
+     */
+    capabilities?: Record<string, LegacyCapabilityEntry>;
+}
+/**
+ * Read the registry, migrating any legacy-only entries on the fly. Always
+ * returns both shapes populated — the compat layer relies on this.
+ */
+export declare function readRegistry(): CapabilityRegistryFile;
+/**
+ * Compat-view accessor: returns the **first** provider for a capability in
+ * legacy 5-field shape. PR 3 sub-step 3f deletes this function once all
+ * call sites are switched to `getProviderEntry` / `listProviders`.
+ */
+export declare function getCapabilityEntry(capability: string): LegacyCapabilityEntry | undefined;
+/**
+ * List all providers for a capability. Used by Connections UI candidate
+ * dropdown and PR 3 multi-candidate resolution.
+ */
+export declare function listProviders(capability: string): CapabilityEntry[];
+/**
+ * Locate a specific provider by composite key. The `(instanceId, capability)`
+ * pair is required (v3.1 §5.3) because one instance may publish multiple
+ * capabilities (`ollama-binary` provides both `ollama-api` and
+ * `ollama-terminal`); `instanceId` alone is not unique.
+ */
+export declare function getProviderEntry(instanceId: string, capability: string): CapabilityEntry | undefined;
+/**
+ * Register or update a single provider entry. Writes to both the new
+ * `providersByCapability` list and the legacy `capabilities` map (compat
+ * layer; PR 3 sub-step 3f drops the legacy write).
+ */
+export declare function registerProvider(entry: CapabilityEntry): void;
+/**
+ * Mark all providers from a given instance as `stopped` instead of deleting
+ * them, so the Connections UI can still show them as candidates (greyed out).
+ * Replaces the previous `unregisterCapabilities` semantics on stop (§5.4).
+ */
+export declare function setProviderStatus(instanceId: string, status: CapabilityStatus): void;
+/**
+ * Remove all providers for an instance permanently — used for uninstall /
+ * delete, NOT for stop (§5.4). After PR 3 sub-step 3c this is the only
+ * path that strips entries from the registry.
+ */
+export declare function unregisterProviders(instanceId: string): void;
+/**
+ * Snapshot of the full registry (read-only). UI / suggestion engine consumes.
+ * Same dedup semantics as `listProviders` so callers iterating the snapshot
+ * (e.g. category-prefix candidate matching in `routes/instances.ts`) don't
+ * leak duplicates.
+ */
+export declare function snapshot(): CapabilityRegistryFile;
+export {};

package/dist/services/capability-registry.js

@@ -0,0 +1,313 @@
+/**
+ * Capability registry — Layer 1 of the app interconnection design (§5).
+ *
+ * Stores `~/.jishushell/apps/capability-registry.json` mapping capability
+ * names to a list of provider entries. PR 1 introduces a schema migration
+ * from the legacy `capabilities: Record<cap, Entry>` (single entry per
+ * capability, last-writer-wins) to `providersByCapability: Record<cap, Entry[]>`
+ * supporting multi-candidate providers.
+ *
+ * **Compat layer (v3.4.x §10.1)**: dual read/write keeps the legacy
+ * `capabilities` field in sync with the new `providersByCapability` so the
+ * legacy `resolveRequires` / `listProvidedCapabilities` paths in app-manager.ts
+ * continue working until PR 3 finishes the call-site migration. PR 3 sub-step
+ * 3f deletes both the compat layer and the legacy `capabilities` field.
+ */
+import { join } from "path";
+import { homedir } from "os";
+import * as config from "../config.js";
+import { safeReadJson, safeWriteJson } from "../utils/safe-json.js";
+/**
+ * Resolve APPS_DIR lazily so partial test mocks of `../config` (which
+ * commonly stub only some exports) don't trip module-load time. Mirrors
+ * the pattern used in `app-manager.ts:44-46` — guard with `name in config`
+ * so vitest's strict mock proxy doesn't throw on undefined property access.
+ */
+function getAppsDir() {
+    const value = "APPS_DIR" in config
+        ? config.APPS_DIR
+        : undefined;
+    if (typeof value === "string" && value.trim())
+        return value;
+    const home = "JISHUSHELL_HOME" in config
+        ? config.JISHUSHELL_HOME
+        : undefined;
+    if (typeof home === "string" && home.trim())
+        return join(home, "apps");
+    return join(process.env.HOME ?? homedir(), ".jishushell", "apps");
+}
+function getRegistryPath() {
+    return join(getAppsDir(), "capability-registry.json");
+}
+function readRegistryFile() {
+    const raw = safeReadJson(getRegistryPath(), "capability-registry");
+    if (!raw)
+        return { providersByCapability: {}, capabilities: {} };
+    // Ensure both fields exist so call sites don't have to null-check.
+    return {
+        providersByCapability: raw.providersByCapability ?? {},
+        capabilities: raw.capabilities ?? {},
+    };
+}
+function writeRegistryFile(reg) {
+    safeWriteJson(getRegistryPath(), reg, true);
+}
+/**
+ * Project a v3.4.x entry down to the legacy 5-field shape so the legacy
+ * `capabilities` map stays consistent with `providersByCapability` during
+ * the PR 1-3 transition.
+ */
+function toLegacyEntry(entry) {
+    const legacy = {
+        instanceId: entry.instanceId,
+        hostPort: entry.hostPort,
+        address: entry.address,
+        registered_at: entry.registeredAt,
+    };
+    if (entry.path)
+        legacy.path = entry.path;
+    return legacy;
+}
+/**
+ * Promote a legacy entry read from disk into the v3.4.x shape so call sites
+ * never have to handle two formats. Called during migration on first read.
+ */
+function fromLegacyEntry(legacy, capability) {
+    // Best-effort host extraction — legacy address is `host:port[/path]`.
+    // Strip the path tail first, then split on the last colon to handle IPv6.
+    let host = "127.0.0.1";
+    const base = legacy.address.split("/")[0];
+    const colonIdx = base.lastIndexOf(":");
+    if (colonIdx > 0)
+        host = base.slice(0, colonIdx);
+    return {
+        instanceId: legacy.instanceId,
+        capability,
+        host,
+        hostPort: legacy.hostPort,
+        path: legacy.path,
+        address: legacy.address,
+        protocol: "http",
+        status: "unknown",
+        registeredAt: legacy.registered_at,
+    };
+}
+/**
+ * Migrate any legacy-only entries on read so subsequent operations see a
+ * uniform `providersByCapability` view. Idempotent.
+ */
+function migrate(reg) {
+    const providers = reg.providersByCapability ?? {};
+    const legacy = reg.capabilities ?? {};
+    let changed = false;
+    for (const [cap, legacyEntry] of Object.entries(legacy)) {
+        const list = providers[cap] ?? [];
+        const alreadyMigrated = list.some((e) => e.instanceId === legacyEntry.instanceId && e.hostPort === legacyEntry.hostPort);
+        if (!alreadyMigrated) {
+            providers[cap] = [...list, fromLegacyEntry(legacyEntry, cap)];
+            changed = true;
+        }
+    }
+    if (changed) {
+        return { providersByCapability: providers, capabilities: legacy };
+    }
+    return { providersByCapability: providers, capabilities: legacy };
+}
+/**
+ * Set the `path` property only when truthy so equality comparisons (used by
+ * `removeProvider` to dedupe) don't see a spurious `path: undefined` mismatch.
+ */
+function ensureProvidersField(reg) {
+    if (!reg.providersByCapability)
+        reg.providersByCapability = {};
+    return reg.providersByCapability;
+}
+function ensureLegacyField(reg) {
+    if (!reg.capabilities)
+        reg.capabilities = {};
+    return reg.capabilities;
+}
+// ── Public API ───────────────────────────────────────────────────────────
+/**
+ * Read the registry, migrating any legacy-only entries on the fly. Always
+ * returns both shapes populated — the compat layer relies on this.
+ */
+export function readRegistry() {
+    return migrate(readRegistryFile());
+}
+/**
+ * Compat-view accessor: returns the **first** provider for a capability in
+ * legacy 5-field shape. PR 3 sub-step 3f deletes this function once all
+ * call sites are switched to `getProviderEntry` / `listProviders`.
+ */
+export function getCapabilityEntry(capability) {
+    const reg = readRegistry();
+    // Prefer running providers when more than one candidate exists, so
+    // `resolveRequires` (single-candidate fallback) hands consumers the
+    // currently usable provider rather than a stale stopped entry.
+    const list = reg.providersByCapability?.[capability] ?? [];
+    const running = list.find((e) => e.status === "running");
+    if (running)
+        return toLegacyEntry(running);
+    // No running candidate. Don't hand back a `stopped` entry — that would
+    // mask `markCapabilitiesStopped`'s intent (see setProviderStatus's
+    // legacy-delete branch) and let resolveRequires return a stale URL. An
+    // `unknown`-status entry is acceptable as a degraded fallback (e.g.
+    // pre-PR 1 registry rows that never carried explicit status).
+    const unknown = list.find((e) => e.status !== "stopped");
+    if (unknown)
+        return toLegacyEntry(unknown);
+    // Fall through to the legacy field in case migration missed something.
+    return reg.capabilities?.[capability];
+}
+/**
+ * Defensive dedup for stored provider lists. Older registry files may
+ * contain duplicate `(instanceId, capability)` rows from earlier
+ * registration paths that wrote without the current upsert logic — they
+ * surface in the UI as ghost candidates with stale `name: null` /
+ * mismatched ports. Collapse to the most-recently-registered row, and
+ * drop entries that have never been observed running (status="unknown"
+ * with no `lastSeenRunningAt`) since those are unambiguous bug residue.
+ */
+function dedupeProviderList(list) {
+    const cleaned = list.filter((e) => !(e.status === "stopped" && !e.lastSeenRunningAt));
+    const byInstance = new Map();
+    for (const entry of cleaned) {
+        const prev = byInstance.get(entry.instanceId);
+        if (!prev) {
+            byInstance.set(entry.instanceId, entry);
+            continue;
+        }
+        const prevTs = prev.registeredAt ?? "";
+        const curTs = entry.registeredAt ?? "";
+        if (curTs >= prevTs)
+            byInstance.set(entry.instanceId, entry);
+    }
+    return Array.from(byInstance.values());
+}
+/**
+ * List all providers for a capability. Used by Connections UI candidate
+ * dropdown and PR 3 multi-candidate resolution.
+ */
+export function listProviders(capability) {
+    const reg = readRegistry();
+    return dedupeProviderList(reg.providersByCapability?.[capability] ?? []);
+}
+/**
+ * Locate a specific provider by composite key. The `(instanceId, capability)`
+ * pair is required (v3.1 §5.3) because one instance may publish multiple
+ * capabilities (`ollama-binary` provides both `ollama-api` and
+ * `ollama-terminal`); `instanceId` alone is not unique.
+ */
+export function getProviderEntry(instanceId, capability) {
+    return listProviders(capability).find((e) => e.instanceId === instanceId);
+}
+/**
+ * Register or update a single provider entry. Writes to both the new
+ * `providersByCapability` list and the legacy `capabilities` map (compat
+ * layer; PR 3 sub-step 3f drops the legacy write).
+ */
+export function registerProvider(entry) {
+    const reg = readRegistry();
+    const providers = ensureProvidersField(reg);
+    const legacy = ensureLegacyField(reg);
+    const list = providers[entry.capability] ?? [];
+    const existingIdx = list.findIndex((e) => e.instanceId === entry.instanceId);
+    if (existingIdx >= 0) {
+        list[existingIdx] = entry;
+    }
+    else {
+        list.push(entry);
+    }
+    providers[entry.capability] = list;
+    // Compat write: keep the legacy single-entry view consistent. When more
+    // than one provider exists, the legacy field reflects the most recently
+    // registered one (matching the previous last-writer-wins behavior).
+    legacy[entry.capability] = toLegacyEntry(entry);
+    writeRegistryFile(reg);
+}
+/**
+ * Mark all providers from a given instance as `stopped` instead of deleting
+ * them, so the Connections UI can still show them as candidates (greyed out).
+ * Replaces the previous `unregisterCapabilities` semantics on stop (§5.4).
+ */
+export function setProviderStatus(instanceId, status) {
+    const reg = readRegistry();
+    const providers = ensureProvidersField(reg);
+    const legacy = ensureLegacyField(reg);
+    const now = new Date().toISOString();
+    let changed = false;
+    for (const [cap, list] of Object.entries(providers)) {
+        for (const entry of list) {
+            if (entry.instanceId !== instanceId)
+                continue;
+            if (entry.status === status)
+                continue;
+            entry.status = status;
+            if (status === "running")
+                entry.lastSeenRunningAt = now;
+            changed = true;
+        }
+        // Re-sync legacy field: stopped instances lose their legacy entry only
+        // if no other running provider remains for that capability, so older
+        // resolveRequires call sites keep finding *something* until PR 3.
+        const stillRunning = list.find((e) => e.status === "running");
+        if (stillRunning) {
+            legacy[cap] = toLegacyEntry(stillRunning);
+        }
+        else if (list.length > 0 && status === "stopped") {
+            // No running provider for this capability — drop the legacy entry so
+            // resolveRequires throws cleanly instead of handing back a stale URL.
+            delete legacy[cap];
+        }
+    }
+    if (changed)
+        writeRegistryFile(reg);
+}
+/**
+ * Remove all providers for an instance permanently — used for uninstall /
+ * delete, NOT for stop (§5.4). After PR 3 sub-step 3c this is the only
+ * path that strips entries from the registry.
+ */
+export function unregisterProviders(instanceId) {
+    const reg = readRegistry();
+    const providers = ensureProvidersField(reg);
+    const legacy = ensureLegacyField(reg);
+    let changed = false;
+    for (const cap of Object.keys(providers)) {
+        const list = providers[cap];
+        const filtered = list.filter((e) => e.instanceId !== instanceId);
+        if (filtered.length !== list.length) {
+            changed = true;
+            if (filtered.length === 0) {
+                delete providers[cap];
+            }
+            else {
+                providers[cap] = filtered;
+            }
+        }
+    }
+    for (const cap of Object.keys(legacy)) {
+        if (legacy[cap].instanceId === instanceId) {
+            delete legacy[cap];
+            changed = true;
+        }
+    }
+    if (changed)
+        writeRegistryFile(reg);
+}
+/**
+ * Snapshot of the full registry (read-only). UI / suggestion engine consumes.
+ * Same dedup semantics as `listProviders` so callers iterating the snapshot
+ * (e.g. category-prefix candidate matching in `routes/instances.ts`) don't
+ * leak duplicates.
+ */
+export function snapshot() {
+    const reg = readRegistry();
+    const cleanProviders = {};
+    for (const [cap, list] of Object.entries(reg.providersByCapability ?? {})) {
+        cleanProviders[cap] = dedupeProviderList(list);
+    }
+    return { ...reg, providersByCapability: cleanProviders };
+}
+//# sourceMappingURL=capability-registry.js.map

package/dist/services/capability-registry.js.map

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

package/dist/services/connection-apply.d.ts

@@ -0,0 +1,91 @@
+/**
+ * Layer 3 — connection apply hooks (§7 of the design).
+ *
+ * Two parallel tables:
+ *
+ *   - PERSIST_HOOKS: invoked by `PUT /api/instances/:id/connections`.
+ *     Writes durable state. LLM/proxy-upstream goes through saveInstanceConfig;
+ *     LLM/openai-env, search, browser, default ENV all go through
+ *     `ctx.writeConnectionEnv()` — that abstraction routes the env to
+ *     `instance.runtime.env` for OpenClaw, the Hermes adapter `.env` for
+ *     Hermes, and `instance.json["connections-env"]` for generic apps.
+ *     MCP merges into mcporter.json.
+ *
+ *   - RUNTIME_HOOKS: invoked at every start. Returns an env map only;
+ *     never writes files. nomad-manager merges the result into the task
+ *     env so the new bindings take effect on restart.
+ *
+ * Sub-step status: PR 4 implements LLM (both modes), Search, default-ENV.
+ * PR 5 lands MCP + Browser.
+ */
+import * as capabilityRegistry from "./capability-registry.js";
+import type { CapabilityEntry } from "./capability-registry.js";
+import type { ResolvedConnection } from "./connection-resolver.js";
+import type { AppInstance } from "./types-shim.js";
+export declare function buildHttpBaseUrl(entry: CapabilityEntry, opts?: {
+    suffix?: string;
+}): string;
+export declare function buildWsUrl(entry: CapabilityEntry, opts?: {
+    suffix?: string;
+}): string;
+export interface ApplyContext {
+    registry: typeof capabilityRegistry;
+    /**
+     * RuntimeAdapter handle for adapter-managed consumers (OpenClaw / Hermes).
+     * `null` for generic container apps without an adapter — `writeConnectionEnv`
+     * then routes to `instance.json["connections-env"]`.
+     */
+    adapter: {
+        applyConnectionEnv?(instanceId: string, env: Record<string, string>): Promise<void>;
+        getConnectionRuntimeEnv?(instanceId: string): Record<string, string>;
+    } | null;
+    /** Persist env into whichever durable location matches the consumer type. */
+    writeConnectionEnv(instance: AppInstance, env: Record<string, string>): Promise<void>;
+}
+export type PersistApplyHook = (instance: AppInstance, binding: ResolvedConnection, ctx: ApplyContext) => Promise<void>;
+export type RuntimeApplyHook = (instance: AppInstance, binding: ResolvedConnection) => Record<string, string> | Promise<Record<string, string>>;
+/**
+ * §7 — resolve the auth token for a provider instance at apply time.
+ *
+ * Returns the bare token string (no "Bearer " prefix — that's the consumer's
+ * call to format). Returns `null` when:
+ *   - entry.auth is absent or kind === "none"
+ *   - tokenSource refers to data that doesn't exist on disk
+ *
+ * Supported tokenSource patterns:
+ *   instance.env.<NAME>      → read from `~/.jishushell/instances/<provider-id>/{model.env,provider.env,.env}`
+ *   instance.config.<path>   → read from openclaw.json via dotted path (e.g. "x-jishushell.proxy.token")
+ *   proxy.token              → read llmProxy.getInstanceToken(provider-id)
+ */
+export declare function resolveProviderToken(entry: CapabilityEntry): Promise<string | null>;
+export declare const persistLlmConnection: PersistApplyHook;
+export declare const runtimeLlmConnection: RuntimeApplyHook;
+export declare const persistSearchConnection: PersistApplyHook;
+export declare const runtimeSearchConnection: RuntimeApplyHook;
+export declare const persistBrowserConnection: PersistApplyHook;
+export declare const runtimeBrowserConnection: RuntimeApplyHook;
+export declare const persistFilesConnection: PersistApplyHook;
+export declare const runtimeFilesConnection: RuntimeApplyHook;
+export declare const persistDefaultConnection: PersistApplyHook;
+export declare const runtimeDefaultConnection: RuntimeApplyHook;
+export declare const persistMcpConnection: PersistApplyHook;
+export declare const runtimeMcpConnection: RuntimeApplyHook;
+export type UnpersistApplyHook = (instance: AppInstance, slot: string, ctx: ApplyContext) => Promise<void>;
+export declare const PERSIST_HOOKS: Record<string, PersistApplyHook>;
+export declare const UNPERSIST_HOOKS: Record<string, UnpersistApplyHook>;
+export declare const RUNTIME_HOOKS: Record<string, RuntimeApplyHook>;
+/**
+ * Re-resolve `connections` for a consumer instance against the live capability
+ * registry and render every binding through RUNTIME_HOOKS into a flat env map.
+ *
+ * Use this at every start (not at PUT time) so that provider port / address
+ * changes propagate without requiring the user to re-bind. preCreate mode is
+ * used to stay tolerant: a missing required binding is surfaced via the
+ * Connections badge, not by failing start with a stale provider URL.
+ *
+ * Failures are caught and logged — start should never block on env merging.
+ */
+export declare function renderRuntimeConnectionsEnv(spec: import("../types.js").AppSpec, instance: {
+    id: string;
+    connections?: import("../types.js").InstanceConnections;
+}): Promise<Record<string, string>>;