jishushell 0.6.5 → 0.6.18

package/dist/services/system/system-ollama-provider.js

@@ -0,0 +1,129 @@
+import { getCoreLanHost, getCorePort } from "../../config.js";
+export const SYSTEM_OLLAMA_PROVIDER_ID = "system-ollama";
+export const SYSTEM_OLLAMA_PROXY_PATH = "/_jishushell/ollama";
+const DETECTION_TTL_MS = 5_000;
+const DEFAULT_OLLAMA_BASES = [
+    "http://127.0.0.1:11434",
+    "http://localhost:11434",
+    "http://[::1]:11434",
+];
+let detectionCache = {
+    expiresAt: 0,
+    value: null,
+};
+function normalizeCandidateBaseUrl(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed)
+        return null;
+    const withScheme = /^[a-z][a-z0-9+.-]*:\/\//i.test(trimmed) ? trimmed : `http://${trimmed}`;
+    try {
+        const parsed = new URL(withScheme);
+        if (parsed.protocol !== "http:" && parsed.protocol !== "https:")
+            return null;
+        parsed.pathname = "";
+        parsed.search = "";
+        parsed.hash = "";
+        return parsed.toString().replace(/\/+$/, "");
+    }
+    catch {
+        return null;
+    }
+}
+function candidateBaseUrls() {
+    const candidates = new Set();
+    const envValue = process.env.OLLAMA_HOST;
+    if (typeof envValue === "string" && envValue.trim()) {
+        const normalized = normalizeCandidateBaseUrl(envValue);
+        if (normalized)
+            candidates.add(normalized);
+    }
+    for (const value of DEFAULT_OLLAMA_BASES) {
+        const normalized = normalizeCandidateBaseUrl(value);
+        if (normalized)
+            candidates.add(normalized);
+    }
+    return Array.from(candidates);
+}
+async function probeOllama(baseUrl, timeoutMs) {
+    try {
+        const response = await fetch(`${baseUrl}/api/tags`, {
+            method: "GET",
+            headers: { accept: "application/json" },
+            signal: AbortSignal.timeout(timeoutMs),
+        });
+        return response.ok;
+    }
+    catch {
+        return false;
+    }
+}
+function buildProvider(nowIso) {
+    let host = "127.0.0.1";
+    try {
+        const candidate = getCoreLanHost();
+        if (candidate.trim())
+            host = candidate.trim();
+    }
+    catch {
+        // fall back to loopback in tests / partial config environments
+    }
+    const hostPort = getCorePort();
+    return {
+        instanceId: SYSTEM_OLLAMA_PROVIDER_ID,
+        name: "System Ollama",
+        capabilityId: "ollama",
+        capability: "llm-ollama",
+        kind: "llm",
+        interface: "openai-compatible",
+        providerKind: "ollama",
+        host,
+        hostPort,
+        path: SYSTEM_OLLAMA_PROXY_PATH,
+        address: `${host}:${hostPort}${SYSTEM_OLLAMA_PROXY_PATH}`,
+        protocol: "http",
+        visibility: "internal",
+        status: "running",
+        registeredAt: nowIso,
+        updatedAt: nowIso,
+    };
+}
+export async function detectSystemOllama(options = {}) {
+    const now = Date.now();
+    if (!options.force && now < detectionCache.expiresAt) {
+        return detectionCache.value;
+    }
+    const timeoutMs = typeof options.timeoutMs === "number" ? options.timeoutMs : 1_200;
+    let detected = null;
+    for (const baseUrl of candidateBaseUrls()) {
+        if (!await probeOllama(baseUrl, timeoutMs))
+            continue;
+        detected = {
+            upstreamBaseUrl: baseUrl,
+            provider: buildProvider(new Date().toISOString()),
+        };
+        break;
+    }
+    detectionCache = {
+        expiresAt: now + DETECTION_TTL_MS,
+        value: detected,
+    };
+    return detected;
+}
+export async function resolveSystemOllamaProxyTarget(pathSuffix) {
+    const detected = await detectSystemOllama();
+    if (!detected)
+        return null;
+    const normalizedSuffix = pathSuffix.replace(/^\/+/, "");
+    if (!normalizedSuffix)
+        return detected.upstreamBaseUrl;
+    if (!/^(api|v1)(\/|$)/.test(normalizedSuffix))
+        return null;
+    return `${detected.upstreamBaseUrl}/${normalizedSuffix}`;
+}
+export function resetSystemOllamaDetectionCache() {
+    detectionCache = {
+        expiresAt: 0,
+        value: null,
+    };
+}
+//# sourceMappingURL=system-ollama-provider.js.map

package/dist/services/system/system-ollama-provider.js.map

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

package/dist/services/system/system-reconciler.d.ts

@@ -0,0 +1,59 @@
+/**
+ * src/services/system/system-reconciler.ts
+ *
+ * Compares the system state rendered by the currently installed code against
+ * host files/services, then applies the shared setup-manager installers when
+ * privileged, domain-specific changes are needed.
+ */
+export type ReconcileFix = "none" | "system-reload" | "docker-pull" | "manual";
+export interface ReconcileItemResult {
+    component: string;
+    status: "ok" | "updated" | "skipped" | "error";
+    message: string;
+    /** Stable resource id from the expected-state renderer */
+    id?: string;
+    /** Host path that was compared */
+    path?: string;
+    /** True if this item requires sudo/root to fix */
+    requiresSudo?: boolean;
+    /** True if service reload/restart is needed before the rendered state is active */
+    reloadRequired?: boolean;
+    /** True if an operator action is required */
+    manualRequired?: boolean;
+    /** Machine-readable fix category */
+    fix?: ReconcileFix;
+    /** Exact command the user should run to fix this item */
+    command?: string;
+    /** Hashes are over normalized text, so irrelevant final newlines do not churn */
+    expectedHash?: string;
+    actualHash?: string;
+    /** Additional technical details for debugging */
+    details?: string;
+    /** Severity for UI display prioritization */
+    severity?: "info" | "warning" | "error";
+}
+export interface ReconcileResult {
+    timestamp: string;
+    items: ReconcileItemResult[];
+    /** True if any items require sudo and were not fixed */
+    hasPendingSudoActions: boolean;
+    /** True if current rendered system state is not active until reload/restart */
+    reloadRequired: boolean;
+    /** True if an operator action is required */
+    manualRequired: boolean;
+    /** True when the local process has enough privilege to apply reload-required fixes */
+    canAutoReload: boolean;
+    /** Standard command to converge system state */
+    command: string;
+}
+export interface SystemReloadStartResult {
+    accepted: true;
+    command: string;
+    message: string;
+    state: ReconcileResult | null;
+    unit?: string;
+}
+export declare function getStoredReconcileState(): ReconcileResult | null;
+export declare function inspectSystemDrift(): Promise<ReconcileResult>;
+export declare function reconcileSystem(): Promise<ReconcileResult>;
+export declare function startSystemReloadWithSudo(sudoPassword: string): Promise<SystemReloadStartResult>;