arcane-os 0.64.0 → 0.65.0

package/src/core/services/local-ai.mjs

@@ -208,17 +208,54 @@ export function createLocalAIService(configuration, {appRoot, runtimes = [], sig
         publish();
     }
 
+    function beginOllamaObservation(engine) {
+        return {revision: ++engine.ollamaRevision, signal: engine.signal};
+    }
+
+    function ownsOllamaObservation(engine, observation) {
+        return observation.signal === engine.signal && !observation.signal.aborted
+            && engine.server.current.available && observation.revision >= engine.ollamaAppliedRevision;
+    }
+
+    function recordOllamaFailure(engine, error, observation) {
+        if (!ownsOllamaObservation(engine, observation)) return;
+        engine.ollamaAppliedRevision = observation.revision;
+        recordFailure(engine, error);
+    }
+
+    function recordOllamaModels(engine, catalog, running, observation) {
+        if (!ownsOllamaObservation(engine, observation)) return;
+        engine.ollamaAppliedRevision = observation.revision;
+        engine.state = {...engine.state, ...engine.server.current, error: null};
+        const resident = new Map((running.models ?? []).map(function residentModel(model) {
+            return [model.model ?? model.name, model];
+        }));
+        const models = new Map((catalog.models ?? []).map(function catalogModel(model) {
+            const id = model.model ?? model.name ?? model.id;
+            return [id, {...model, id, loaded: resident.has(id)}];
+        }));
+        for (const [id, model] of resident) {
+            if (!models.has(id)) models.set(id, {...model, id, loaded: true});
+        }
+        engine.models = [...models.values()];
+    }
+
     async function refreshModels(engine, signal) {
         const revision = engine.revision;
         if (engine.id === 'ollama') {
-            const [catalog, running] = await Promise.all([
-                requestLocalJSON({url: engine.server.url, path: '/api/tags', signal}),
-                requestLocalJSON({url: engine.server.url, path: '/api/ps', signal})
-            ]);
-            const loaded = new Set((running.models ?? []).map(function loadedId(model) { return model.model ?? model.name; }));
-            engine.models = (catalog.models ?? []).map(function ollamaModel(model) {
-                return {...model, id: model.model ?? model.name, loaded: loaded.has(model.model ?? model.name)};
-            });
+            const observation = beginOllamaObservation(engine);
+            const observationSignal = signal ? AbortSignal.any([signal, observation.signal]) : observation.signal;
+            try {
+                const [catalog, running] = await Promise.all([
+                    requestLocalJSON({url: engine.server.url, path: '/api/tags', signal: observationSignal}),
+                    requestLocalJSON({url: engine.server.url, path: '/api/ps', signal: observationSignal})
+                ]);
+                observationSignal.throwIfAborted();
+                recordOllamaModels(engine, catalog, running, observation);
+            } catch (error) {
+                if (!observationSignal.aborted) recordOllamaFailure(engine, error, observation);
+                throw error;
+            }
         } else {
             const properties = await requestLocalJSON({url: engine.server.url, path: '/props', signal});
             engine.router = properties.role === 'router';
@@ -427,6 +464,34 @@ export function createLocalAIService(configuration, {appRoot, runtimes = [], sig
 
     async function ollamaRequest(operation, parameters = {}, request, method = 'POST') {
         const engine = await engineReady('ollama', request.signal);
+        const engineSignal = engine.signal;
+        const observation = operation === 'ps' ? beginOllamaObservation(engine) : null;
+        try {
+            const result = await ollamaResponse(engine, operation, parameters, request, method);
+            if (operation === 'ps') {
+                recordOllamaModels(engine, {models: engine.models}, result, observation);
+                publish();
+            }
+            return result;
+        } catch (error) {
+            if (operation === 'ps' && !request.signal.aborted) recordOllamaFailure(engine, error, observation);
+            throw error;
+        } finally {
+            // Every owned operation that can change residency/catalog leaves
+            // a real upstream observation, including cancellation or failure.
+            if (['chat', 'generate', 'embed', 'pull', 'create', 'copy', 'delete'].includes(operation)
+                && engine.signal === engineSignal && !engineSignal.aborted) {
+                try {
+                    await refreshModels(engine, engineSignal);
+                } catch {
+                    // The refresh publishes only its current owned failure;
+                    // retain the operation's original result or error.
+                }
+            }
+        }
+    }
+
+    async function ollamaResponse(engine, operation, parameters, request, method) {
         const signal = AbortSignal.any([request.signal, engine.signal]);
         const {streamId, ...payload} = parameters;
         if (payload.stream !== true) {
@@ -472,6 +537,8 @@ export function createLocalAIService(configuration, {appRoot, runtimes = [], sig
     function startEngine(engine) {
         engine.controller = new AbortController();
         engine.signal = AbortSignal.any([lifetimeSignal, engine.controller.signal]);
+        engine.ollamaRevision = 0;
+        engine.ollamaAppliedRevision = 0;
         const signal = engine.signal;
         engine.server = createLocalAIServer({
             id: engine.id, appRoot, runtime: runtimes.find(function runtimeRecord(record) { return record.id === engine.id; }),
@@ -487,7 +554,10 @@ export function createLocalAIService(configuration, {appRoot, runtimes = [], sig
             }
             return engine;
         });
-        engine.ready.catch(function startupFailed(error) { if (!signal.aborted) recordFailure(engine, error); });
+        engine.ready.catch(function startupFailed(error) {
+            // Ollama refreshes and the server already publish their own failures.
+            if (!signal.aborted && engine.id !== 'ollama') recordFailure(engine, error);
+        });
     }
 
     const service = {
@@ -557,7 +627,7 @@ export function createLocalAIService(configuration, {appRoot, runtimes = [], sig
                         await refreshModels(engine, request.signal);
                     } catch (error) {
                         request.signal.throwIfAborted();
-                        recordFailure(engine, error);
+                        if (engine.id !== 'ollama') recordFailure(engine, error);
                     }
                 }));
                 return snapshot();

package/src/dev-server.mjs

@@ -855,6 +855,7 @@ async function startOwnedDevServer({
     certPath,
     keyPath,
     localAI,
+    core = localAI,
     signal,
     sdkRuntimeSourceRoot
 }={},events,releaseSignal){
@@ -1261,7 +1262,7 @@ async function startOwnedDevServer({
                 response.end();
                 return;
             }
-            if (localAI && await localAI.handler(request, response)) return;
+            if (core && await core.handler(request, response)) return;
             if(request.method!=='GET'&&request.method!=='HEAD'){
                 deny(response,405,'Method not allowed.');
                 return;
@@ -1558,7 +1559,7 @@ async function startOwnedDevServer({
         }
         if(!closeInitiated){
             closeInitiated=true;
-            localAIClosing=Promise.resolve().then(function closeLocalAI(){return localAI?.close(error);});
+            localAIClosing=Promise.resolve().then(function closeCore(){return core?.close(error);});
             localAIClosing.catch(function observeLocalAICloseFailure(closeError){operationalError??=closeError;});
             try{
                 closeDevelopmentListeners(fileServer, tlsServer).then(

package/src/index.mjs

@@ -146,6 +146,7 @@ export {
 } from './workspace.mjs';
 export {materializeInstalledSdkRuntime} from './installed-sdk-runtime.mjs';
 export {startDevServer} from './dev-server.mjs';
+export {createDevelopmentCore} from './core/development.mjs';
 export {startSourceExampleServer} from './source-server.mjs';
 export {acceptWebSocket} from './websocket.mjs';
 export {WS} from '../browser-runtime/websocket-client.mjs';