jishushell 0.6.5 → 0.6.18

package/dist/services/connection-apply.js

@@ -1,471 +0,0 @@
-// ── URL builders (§7.0) ─────────────────────────────────────────────────
-function isIPv6(host) {
-    return /:.*:/.test(host) && !host.startsWith("[");
-}
-function bracketIPv6(host) {
-    return isIPv6(host) ? `[${host}]` : host;
-}
-export function buildHttpBaseUrl(entry, opts = {}) {
-    const protocol = entry.protocol === "https" ? "https" : "http";
-    const url = new URL(`${protocol}://${bracketIPv6(entry.host)}:${entry.hostPort}`);
-    if (entry.path && entry.path !== "/")
-        url.pathname = entry.path;
-    const suffix = opts.suffix ?? "";
-    if (suffix) {
-        const norm = (s) => s.replace(/^\/+|\/+$/g, "");
-        if (!norm(url.pathname).endsWith(norm(suffix))) {
-            url.pathname = `${url.pathname.replace(/\/+$/, "")}/${suffix.replace(/^\/+/, "")}`;
-        }
-    }
-    return url.toString().replace(/\/$/, "");
-}
-export function buildWsUrl(entry, opts = {}) {
-    const protocol = entry.protocol === "wss" ? "wss" : "ws";
-    let url = `${protocol}://${bracketIPv6(entry.host)}:${entry.hostPort}`;
-    if (entry.path && entry.path !== "/")
-        url += entry.path;
-    if (opts.suffix)
-        url += opts.suffix.startsWith("/") ? opts.suffix : `/${opts.suffix}`;
-    return url;
-}
-// ── providerKindFromCapability for LLM proxy-upstream mode ─────────────
-function providerKindFromCapability(cap) {
-    const m = cap.match(/^llm-(ollama|vllm|sglang)$/);
-    if (m)
-        return m[1];
-    return "custom";
-}
-// ── LLM proxy-upstream mode ────────────────────────────────────────────
-const persistLlmProxyUpstream = async (instance, binding, _ctx) => {
-    if (binding.entries.length !== 1)
-        return;
-    const entry = binding.entries[0];
-    const baseUrl = buildHttpBaseUrl(entry, { suffix: "/v1" });
-    const providerKind = providerKindFromCapability(entry.capability);
-    // Probe the upstream so the user gets a "one-click connect" experience on
-    // the Connections tab: without this, models[] is empty and selectedModelId
-    // ends up as the placeholder "default", causing an immediate 404 from
-    // ollama / any sane backend on the very first chat request.
-    //
-    // probeProviderModels reuses the same path the LLM-Provider tab's "拉取
-    // 模型" button uses; failure (network, 4xx, etc.) is logged and swallowed
-    // — bind itself must not be blocked by transient probe issues. When the
-    // probe succeeds we also pre-pick the first model so the chat works
-    // without the user touching anything else.
-    let models;
-    let selectedModelId = binding.selectedModelId;
-    try {
-        const { probeProviderModels } = await import("./llm-proxy/probe.js");
-        const probed = await probeProviderModels(baseUrl, "", "Authorization", providerKind);
-        if (probed && probed.length > 0) {
-            models = probed
-                .map((m) => ({ id: String(m.id ?? m.name ?? ""), name: String(m.name ?? m.id ?? "") }))
-                .filter((m) => m.id);
-            if (!selectedModelId && models.length > 0)
-                selectedModelId = models[0].id;
-        }
-    }
-    catch (e) {
-        console.warn(`[connection-apply] probe upstream failed for ${instance.id} (${providerKind}, ${baseUrl}): ${e?.message ?? e}`);
-    }
-    // saveInstanceConfig encrypts apiKey itself — pass plaintext (empty for
-    // local LOCAL_PROVIDER_IDS ollama / vllm / sglang / custom).
-    const { getInstanceConfig, saveInstanceConfig } = await import("./llm-proxy/instance-proxy.js");
-    const config = getInstanceConfig(instance.id) ?? {};
-    const xj = (config["x-jishushell"] ??= {});
-    xj.proxy = xj.proxy ?? {};
-    xj.proxy.upstream = {
-        providerId: providerKind,
-        baseUrl,
-        api: "openai-completions",
-        authHeader: false,
-        apiKey: "",
-        ...(models && models.length ? { models } : {}),
-        ...(selectedModelId ? { selectedModelId } : {}),
-    };
-    await saveInstanceConfig(instance.id, config);
-};
-// ── resolveProviderToken (§7, PR B) ────────────────────────────────────
-/**
- * §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 instance proxy token from llm-proxy state
- */
-export async function resolveProviderToken(entry) {
-    const auth = entry.auth;
-    if (!auth || auth.kind === "none")
-        return null;
-    const src = auth.tokenSource;
-    if (!src)
-        return null;
-    // instance.env.<NAME>
-    const envMatch = src.match(/^instance\.env\.([A-Z][A-Z0-9_]*)$/);
-    if (envMatch) {
-        const name = envMatch[1];
-        return readEnvVarFromInstanceDir(entry.instanceId, name);
-    }
-    if (src === "proxy.token") {
-        const { getInstanceToken } = await import("./llm-proxy/instance-proxy.js");
-        if (typeof getInstanceToken !== "function")
-            return null;
-        const token = getInstanceToken(entry.instanceId);
-        return typeof token === "string" && token ? token : null;
-    }
-    // instance.config.<dotted.path>
-    const cfgMatch = src.match(/^instance\.config\.(.+)$/);
-    if (cfgMatch) {
-        const path = cfgMatch[1];
-        return readConfigPathFromInstanceDir(entry.instanceId, path);
-    }
-    return null;
-}
-async function readEnvVarFromInstanceDir(instanceId, name) {
-    const { readFile } = await import("node:fs/promises");
-    const { join } = await import("node:path");
-    const { homedir } = await import("node:os");
-    const root = join(homedir(), ".jishushell");
-    // Priority order: app-manager apps (newer layout) first, then legacy instance layout.
-    const candidates = [
-        join(root, "apps", instanceId, "agent-home", ".env"),
-        join(root, "apps", instanceId, ".env"),
-        join(root, "instances", instanceId, "model.env"),
-        join(root, "instances", instanceId, "provider.env"),
-        join(root, "instances", instanceId, ".env"),
-    ];
-    for (const filePath of candidates) {
-        try {
-            const content = await readFile(filePath, "utf8");
-            for (const line of content.split("\n")) {
-                const m = line.match(/^\s*([A-Z_][A-Z0-9_]*)\s*=\s*(.*?)\s*$/);
-                if (!m)
-                    continue;
-                if (m[1] !== name)
-                    continue;
-                let val = m[2];
-                if ((val.startsWith('"') && val.endsWith('"')) ||
-                    (val.startsWith("'") && val.endsWith("'"))) {
-                    val = val.slice(1, -1);
-                }
-                if (!val)
-                    continue;
-                return val;
-            }
-        }
-        catch {
-            // file missing — try next
-        }
-    }
-    return null;
-}
-async function readConfigPathFromInstanceDir(instanceId, path) {
-    const { readFile } = await import("node:fs/promises");
-    const { join } = await import("node:path");
-    const { homedir } = await import("node:os");
-    const root = join(homedir(), ".jishushell");
-    const candidates = [
-        join(root, "apps", instanceId, "openclaw-home", ".openclaw", "openclaw.json"),
-        join(root, "instances", instanceId, "openclaw-home", ".openclaw", "openclaw.json"),
-    ];
-    for (const filePath of candidates) {
-        try {
-            const content = await readFile(filePath, "utf8");
-            const obj = JSON.parse(content);
-            let cur = obj;
-            for (const part of path.split(".")) {
-                if (cur == null || typeof cur !== "object")
-                    return null;
-                cur = cur[part];
-            }
-            return typeof cur === "string" && cur ? cur : null;
-        }
-        catch {
-            // try next
-        }
-    }
-    return null;
-}
-// ── LLM openai-env mode ────────────────────────────────────────────────
-async function llmOpenaiEnv(binding) {
-    if (binding.entries.length !== 1)
-        return {};
-    const entry = binding.entries[0];
-    const rootUrl = buildHttpBaseUrl(entry);
-    const baseUrl = buildHttpBaseUrl(entry, { suffix: "/v1" });
-    const token = await resolveProviderToken(entry);
-    const slotValue = entry.capability === "llm-ollama" && /(?:^|_)OLLAMA_URL$/i.test(binding.slot)
-        ? rootUrl
-        : baseUrl;
-    return {
-        [binding.slot]: slotValue,
-        OPENAI_API_KEY: token ?? "",
-        OPENAI_API_BASE: baseUrl,
-        OPENAI_BASE_URL: baseUrl,
-    };
-}
-const persistLlmOpenaiEnv = async (instance, binding, ctx) => {
-    await ctx.writeConnectionEnv(instance, await llmOpenaiEnv(binding));
-};
-const _runtimeLlmOpenaiEnv = async (_instance, binding) => llmOpenaiEnv(binding);
-// ── LLM dispatch ───────────────────────────────────────────────────────
-export const persistLlmConnection = async (instance, binding, ctx) => {
-    const mode = binding.apply ?? defaultLlmMode(ctx);
-    if (mode === "proxy-upstream")
-        return persistLlmProxyUpstream(instance, binding, ctx);
-    return persistLlmOpenaiEnv(instance, binding, ctx);
-};
-export const runtimeLlmConnection = async (_instance, binding) => {
-    const mode = binding.apply ?? "openai-env"; // adapter-typed defaults handled at persist time
-    if (mode === "proxy-upstream")
-        return {}; // runtime env already pinned by adapter
-    return llmOpenaiEnv(binding);
-};
-function defaultLlmMode(ctx) {
-    // adapter-managed consumers (OpenClaw / Hermes) default to proxy-upstream;
-    // generic container consumers (no adapter) default to openai-env.
-    return ctx.adapter ? "proxy-upstream" : "openai-env";
-}
-// ── Search ─────────────────────────────────────────────────────────────
-function searchEnv(binding) {
-    if (binding.entries.length !== 1)
-        return {};
-    const entry = binding.entries[0];
-    const url = buildHttpBaseUrl(entry, { suffix: entry.path && entry.path !== "/" ? "" : "/search" });
-    return { [binding.slot]: url };
-}
-export const persistSearchConnection = async (instance, binding, ctx) => {
-    await ctx.writeConnectionEnv(instance, searchEnv(binding));
-};
-export const runtimeSearchConnection = (_instance, binding) => searchEnv(binding);
-// ── Browser (PR 5 fills CDP/MCP — for now, raw env injection) ──────────
-function browserEnv(binding) {
-    if (binding.entries.length !== 1)
-        return {};
-    const entry = binding.entries[0];
-    const url = entry.protocol === "ws" || entry.protocol === "wss"
-        ? buildWsUrl(entry)
-        : buildHttpBaseUrl(entry);
-    return { [binding.slot]: url };
-}
-export const persistBrowserConnection = async (instance, binding, ctx) => {
-    await ctx.writeConnectionEnv(instance, browserEnv(binding));
-};
-export const runtimeBrowserConnection = (_instance, binding) => browserEnv(binding);
-// ── Files (UI-only: inject panel URL so agent can surface filebrowser) ─
-function filesEnv(binding) {
-    if (binding.entries.length !== 1)
-        return {};
-    const entry = binding.entries[0];
-    const url = buildHttpBaseUrl(entry);
-    return { [binding.slot]: url };
-}
-export const persistFilesConnection = async (instance, binding, ctx) => {
-    await ctx.writeConnectionEnv(instance, filesEnv(binding));
-};
-export const runtimeFilesConnection = (_instance, binding) => filesEnv(binding);
-// ── Knowledge (OpenClaw-only kb shim integration) ──────────────────────
-//
-// The Knowledge slot's runtime effect is wired by the OpenClaw adapter
-// (`onBeforeStart` reads `instance.connections.KNOWLEDGE_BASE_URL` and
-// either installs the AnythingLLM kb shim into mcporter.json or strips
-// it). The previous mapping reused `persistFilesConnection`, which wrote
-// a `KNOWLEDGE_BASE_URL=<anythingllm-url>` env var that no consumer
-// reads — and worse, the URL alone is useless without an auth header
-// and workspace slug. Making it an explicit no-op stops the misleading
-// env injection while still letting `instance.connections` track the
-// binding (the route writes that directly, independent of these hooks).
-const persistKnowledgeConnection = async (_instance, _binding, _ctx) => {
-    // No-op: real wiring lives in src/services/runtime/adapters/openclaw.ts
-    // (kb shim block in onBeforeStart). instance.connections is persisted
-    // by the route before hooks run, so the binding still sticks.
-};
-const runtimeKnowledgeConnection = (_instance, _binding) => {
-    // No-op: kb shim is wired via mcporter.json by the OpenClaw adapter on
-    // every start, not via runtime env injection.
-    return {};
-};
-// unpersistKnowledgeConnection lives further down with the other unpersist
-// hooks (UnpersistApplyHook type is declared later in the file).
-// ── Default ENV (bindable exact + unknown categories) ─────────────────
-function defaultEnv(binding) {
-    if (binding.entries.length === 0)
-        return {};
-    // For default-ENV bindings we serialize entry.address (host:port[/path]).
-    return { [binding.slot]: binding.entries.map((e) => e.address).join(",") };
-}
-export const persistDefaultConnection = async (instance, binding, ctx) => {
-    await ctx.writeConnectionEnv(instance, defaultEnv(binding));
-};
-export const runtimeDefaultConnection = (_instance, binding) => defaultEnv(binding);
-// ── MCP — merges into mcporter.json with an explicit __source marker so
-//   we can later (un)bind without touching user-managed entries (§7.2).
-export const persistMcpConnection = async (instance, binding, _ctx) => {
-    if (binding.entries.length === 0)
-        return;
-    const { mergeMcporterServers, removeMcporterServers } = await import("./runtime/adapters/openclaw-mcporter.js");
-    // Replace-style: drop any prior connection-managed entries for this
-    // (slot, consumer) pair, then re-merge the current set.
-    removeMcporterServers(instance.id, {
-        source: { kind: "connection", slot: binding.slot, consumerInstanceId: instance.id },
-    });
-    const servers = {};
-    for (const entry of binding.entries) {
-        const name = sanitize(`${entry.capability}-${entry.instanceId}`);
-        const transport = mcporterTransport(entry.protocol);
-        const url = transport === "stdio" ? undefined : buildHttpBaseUrl(entry);
-        servers[name] = {
-            ...(transport ? { transport } : {}),
-            ...(url ? { url } : {}),
-            __source: {
-                kind: "connection",
-                slot: binding.slot,
-                consumerInstanceId: instance.id,
-            },
-        };
-    }
-    mergeMcporterServers(instance.id, servers);
-};
-export const runtimeMcpConnection = (_instance, _binding) => {
-    // mcporter.json is read by the runtime directly; no env injection needed.
-    return {};
-};
-function sanitize(name) {
-    return name.replace(/[^a-zA-Z0-9_-]/g, "-").slice(0, 64);
-}
-function mcporterTransport(protocol) {
-    switch ((protocol || "").toLowerCase()) {
-        case "http":
-        case "https":
-            return "http";
-        case "sse":
-        case "ws":
-        case "wss":
-            return "sse";
-        default:
-            return undefined;
-    }
-}
-const unpersistLlmConnection = async (instance, _slot, ctx) => {
-    // Adapter-managed (proxy-upstream) consumers — OpenClaw / Hermes — keep
-    // their LLM target on `x-jishushell.proxy.upstream`. When the binding
-    // disappears, fall back to the core default provider so the chat
-    // path stays usable. Generic openai-env consumers just have their env
-    // cleared — there's nothing to "fall back" to for them.
-    if (!ctx.adapter) {
-        await ctx.writeConnectionEnv(instance, { OPENAI_BASE_URL: "", OPENAI_API_KEY: "" });
-        return;
-    }
-    const { decryptApiKey } = await import("./llm-proxy/encryption.js");
-    const { pushDefaultProviderToInstance } = await import("./llm-proxy/instance-proxy.js");
-    const { getDefaultLlmProvider, normalizeProviderApi } = await import("./llm-proxy/providers.js");
-    const dp = getDefaultLlmProvider();
-    if (!dp) {
-        // No default to fall back to — leave the upstream as-is. The
-        // Connections badge already surfaces "未绑定" for the consumer; the
-        // proxy will return 401/4xx until the user picks a provider.
-        return;
-    }
-    await pushDefaultProviderToInstance(instance.id, {
-        providerId: dp.id,
-        baseUrl: dp.baseUrl,
-        api: normalizeProviderApi(dp.api),
-        authHeader: !!dp.authHeader,
-        models: dp.models ?? [],
-        selectedModelId: dp.selectedModelId ?? "",
-        apiKey: dp.apiKey ? decryptApiKey(dp.apiKey) : "",
-    });
-};
-const unpersistEnvSlotConnection = async (instance, slot, ctx) => {
-    // Search / browser / default-ENV all inject a single env var with key
-    // === slot. Empty-string overwrites the previous value so consumers see
-    // an unset binding instead of the stale URL.
-    await ctx.writeConnectionEnv(instance, { [slot]: "" });
-};
-const unpersistMcpConnection = async (instance, slot, _ctx) => {
-    const { removeMcporterServers } = await import("./runtime/adapters/openclaw-mcporter.js");
-    removeMcporterServers(instance.id, {
-        source: { kind: "connection", slot, consumerInstanceId: instance.id },
-    });
-};
-const unpersistKnowledgeConnection = async (_instance, _slot, _ctx) => {
-    // No-op: the OpenClaw adapter's kb wiring detects `null` / missing
-    // binding on the next start and strips the kb mcporter entry, shim
-    // file, and TOOLS.md kb hint. Clearing env here would be meaningless
-    // since persistKnowledgeConnection never injected anything.
-};
-// ── Hook registries ────────────────────────────────────────────────────
-export const PERSIST_HOOKS = {
-    llm: persistLlmConnection,
-    search: persistSearchConnection,
-    browser: persistBrowserConnection,
-    mcp: persistMcpConnection,
-    files: persistFilesConnection,
-    // Knowledge bindings are persisted in instance.connections by the route
-    // (before hooks run), but the actual MCP shim wiring (kb stdio shim into
-    // mcporter.json + TOOLS.md kb section + sibling secret.json) is performed
-    // by the OpenClaw adapter's onBeforeStart based on the binding state +
-    // credentials.json existence. The hook here is an explicit no-op — we
-    // deliberately do NOT inject a generic `KNOWLEDGE_BASE_URL` env var
-    // because the URL alone is unusable without auth + workspace.
-    knowledge: persistKnowledgeConnection,
-    default: persistDefaultConnection,
-};
-export const UNPERSIST_HOOKS = {
-    llm: unpersistLlmConnection,
-    search: unpersistEnvSlotConnection,
-    browser: unpersistEnvSlotConnection,
-    mcp: unpersistMcpConnection,
-    files: unpersistEnvSlotConnection,
-    knowledge: unpersistKnowledgeConnection,
-    default: unpersistEnvSlotConnection,
-};
-export const RUNTIME_HOOKS = {
-    llm: runtimeLlmConnection,
-    search: runtimeSearchConnection,
-    browser: runtimeBrowserConnection,
-    mcp: runtimeMcpConnection,
-    files: runtimeFilesConnection,
-    knowledge: runtimeKnowledgeConnection,
-    default: runtimeDefaultConnection,
-};
-/**
- * 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 async function renderRuntimeConnectionsEnv(spec, instance) {
-    try {
-        const connections = instance.connections ?? {};
-        const { resolveConnections } = await import("./connection-resolver.js");
-        const { resolved } = resolveConnections(spec, { connections }, "preCreate");
-        if (resolved.length === 0)
-            return {};
-        const merged = {};
-        for (const binding of resolved) {
-            const hook = RUNTIME_HOOKS[binding.category];
-            if (!hook)
-                continue;
-            const env = await hook(instance, binding);
-            Object.assign(merged, env);
-        }
-        return merged;
-    }
-    catch (e) {
-        console.warn(`[connection-apply] renderRuntimeConnectionsEnv failed for ${instance.id}: ${e?.message ?? e}`);
-        return {};
-    }
-}
-//# sourceMappingURL=connection-apply.js.map

package/dist/services/connection-apply.js.map

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

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

@@ -1,65 +0,0 @@
-import type { CapabilityEntry } from "./capability-registry.js";
-import type { AppSpec, InstanceConnections } from "../types.js";
-export declare function isCategoryToken(s: string): boolean;
-/**
- * Extract the category of a provide-side capability name. Returns the
- * category token ("llm" / "search" / "browser" / "mcp") when the name is
- * `<token>-something`; null for legacy exact names like `ollama-api`.
- */
-export declare function categoryFromProviderCapability(cap: string): string | null;
-/**
- * For LLM `proxy-upstream` mode: convert a provide capability like
- * `llm-ollama` to the providerKind token (`ollama` / `vllm` / `sglang` /
- * `custom`) the embedded llm-proxy expects on `x-jishushell.proxy.upstream.providerId`.
- */
-export declare function providerKindFromCapability(cap: string): string;
-export interface ResolvedConnection {
-    slot: string;
-    capability: string;
-    category: string;
-    required: boolean;
-    apply?: "proxy-upstream" | "openai-env";
-    cardinality: "one" | "many";
-    /** Provider entries (single-candidate has length 1; many can be ≥1). */
-    entries: CapabilityEntry[];
-    /** Source of the binding — affects how apply hooks render the change. */
-    source: "ui-binding" | "legacy-fallback";
-}
-export interface PendingRequire {
-    slot: string;
-    capability: string;
-    required: boolean;
-    reason: "no-candidate" | "ambiguous" | "user-disconnected" | "needs-ui-binding";
-}
-export interface ResolveResult {
-    resolved: ResolvedConnection[];
-    pending: PendingRequire[];
-}
-export type ResolveMode = "preCreate" | "runtime";
-export declare class ConnectionError extends Error {
-    code: string;
-    statusCode: number;
-    details?: any;
-    constructor(code: string, statusCode: number, message: string, details?: any);
-}
-/**
- * Resolve all `requires` on `spec` against the registry + the instance's
- * persisted bindings.
- *
- * @param spec     Consumer app spec (`requires[]` is the input)
- * @param instance Consumer app instance shape — may be a stub
- *                 `{ connections: {} }` during create-instance / install
- *                 (preCreate mode) or the live instance.json (runtime).
- * @param mode     Affects error semantics: preCreate never throws on
- *                 missing/ambiguous; runtime throws.
- */
-export declare function resolveConnections(spec: AppSpec, instance: {
-    connections?: InstanceConnections;
-}, mode: ResolveMode): ResolveResult;
-/**
- * Convenience helper: resolved → flat env map (for default-ENV legacy
- * fallback path used in install Phase 1, see §6.4 lazy materialization).
- * Only entries with category=="default" are projected; LLM/MCP/Search/Browser
- * categories use their own apply hooks (PR 4) and are skipped here.
- */
-export declare function resolvedToLegacyEnv(resolved: ResolvedConnection[]): Record<string, string>;