alpha.13 train: Qwen2.5 1.5B, download resume and retry, memory admission and idle release (#84, #98)

capsules/_shared/model-management.js

@@ -14,8 +14,9 @@
   });
   const failureText = p => FAILURE_TEXT[p.failure_class] || "Preparation failed.";
   const DISPATCH_UNAVAILABLE_TEXT = Object.freeze({
-    unsupported_host: "Keep this model on this device. To run it, use a supported device.",
+    unsupported_host: "Local AI is not supported on this device.",
     source_engine_required: "This source Home needs its local model engine. Install the engine through source setup, then Retry.",
+    catalog_updated: "Model list updated. Press Use to keep using this model.",
   });
   // One phase per Runtime projection. The full view (System) and the compact
   // Marketplace detail read their copy from the same phase.
@@ -331,7 +332,9 @@
           progress.setAttribute("aria-label", "Preparation progress"); row.append(progress, element("p", `${formatBytes(p.completed_bytes)} of ${formatBytes(p.total_bytes)} prepared`));
         }
         const controls = element("div", "", "model-controls");
-        const use = button((p && p.state !== "reclaimed") || unresolvedUse ? "Retry" : compact ? "Get" : "Download", () => void act("use"), active(p) || reconcileRequired);
+        const useLabel = r.dispatch_unavailable_reason === "catalog_updated" ? "Use"
+          : (p && p.state !== "reclaimed") || unresolvedUse ? "Retry" : compact ? "Get" : "Download";
+        const use = button(useLabel, () => void act("use"), active(p) || reconcileRequired);
         use.dataset.modelControl = "use";
         if (!active(p) && !r.dispatch_ready) controls.append(use);
         if (r.dispatch_ready && typeof onReadyOpen === "function") {

capsules/marketplace/browser/marketplace.js

@@ -441,7 +441,7 @@ import { sharedModelOffers, modelAccessOpportunities, REMOTE_MODEL_ID, SERVICE_O
       name: publicTitle(capsule),
       developer: String(model ? capsule.publisher_did : capsule.author || "").trim(),
       category: appCategory(capsule, role),
-      description: model ? "Language model for Assistant." : publicDescription(capsule),
+      description: model ? modelDescription(capsule) : publicDescription(capsule),
       version: String(capsule.version || ""),
       installed,
       launchable,
@@ -465,6 +465,13 @@ import { sharedModelOffers, modelAccessOpportunities, REMOTE_MODEL_ID, SERVICE_O
     };
   }
 
+  // A signed catalogue entry may carry its own one-line description; without
+  // one, Runtime's generic capsule text is replaced by the model's purpose.
+  function modelDescription(capsule) {
+    const description = String(capsule.description || "").trim();
+    return description && !/\bruntime\b/i.test(description) ? description : "Language model for Assistant.";
+  }
+
   function appCategory(capsule, role) {
     if (capsule.source === "signed-model-catalog") return "models";
     const category = String(capsule.category || "").toLowerCase();

capsules/marketplace/browser/model-management.js

@@ -14,8 +14,9 @@
   });
   const failureText = p => FAILURE_TEXT[p.failure_class] || "Preparation failed.";
   const DISPATCH_UNAVAILABLE_TEXT = Object.freeze({
-    unsupported_host: "Keep this model on this device. To run it, use a supported device.",
+    unsupported_host: "Local AI is not supported on this device.",
     source_engine_required: "This source Home needs its local model engine. Install the engine through source setup, then Retry.",
+    catalog_updated: "Model list updated. Press Use to keep using this model.",
   });
   // One phase per Runtime projection. The full view (System) and the compact
   // Marketplace detail read their copy from the same phase.
@@ -331,7 +332,9 @@
           progress.setAttribute("aria-label", "Preparation progress"); row.append(progress, element("p", `${formatBytes(p.completed_bytes)} of ${formatBytes(p.total_bytes)} prepared`));
         }
         const controls = element("div", "", "model-controls");
-        const use = button((p && p.state !== "reclaimed") || unresolvedUse ? "Retry" : compact ? "Get" : "Download", () => void act("use"), active(p) || reconcileRequired);
+        const useLabel = r.dispatch_unavailable_reason === "catalog_updated" ? "Use"
+          : (p && p.state !== "reclaimed") || unresolvedUse ? "Retry" : compact ? "Get" : "Download";
+        const use = button(useLabel, () => void act("use"), active(p) || reconcileRequired);
         use.dataset.modelControl = "use";
         if (!active(p) && !r.dispatch_ready) controls.append(use);
         if (r.dispatch_ready && typeof onReadyOpen === "function") {

capsules/model-provider/src/adapters.rs

@@ -1753,6 +1753,9 @@ async fn run_local_text_worker_with_timing(
     )
     .then(HostedBackendReport::default);
     let mut local_socket = None;
+    // Holds the local execution slot until this run ends; dropping it arms
+    // the engine's idle release.
+    let mut _local_run = None;
     let (api_url, api_key, body, private_endpoint, context_window_tokens) = match &task.backend {
         LocalTextBackend::OpenRouterDecisions {
             api_url,
@@ -1816,6 +1819,19 @@ async fn run_local_text_worker_with_timing(
             settings,
             requested_output_tokens,
         } => {
+            let run = tokio::select! {
+                biased;
+                _ = task.cancel_rx.wait_for(|cancelled| *cancelled) => {
+                    return Ok(queued_local_cancelled());
+                }
+                run = tokio::time::timeout(
+                    remaining_run_timeout(task.deadline_ms)?,
+                    engines.begin_run(),
+                ) => run
+                    .map_err(|_| map_local_llama_fault(LocalLlamaFault::Timeout))?
+                    .map_err(map_local_llama_fault)?,
+            };
+            _local_run = Some(run);
             let endpoint = engines
                 .endpoint_with_timeout(
                     offer_id,
@@ -2205,6 +2221,16 @@ async fn run_decision_worker(
 
 fn map_local_llama_fault(fault: LocalLlamaFault) -> AdapterFault {
     match fault {
+        LocalLlamaFault::MemoryUnavailable => AdapterFault {
+            error: RunError {
+                class: ErrorClass::ContextRejected,
+                code: "model_memory_unavailable".into(),
+                message:
+                    "Not enough free memory for this model. Close other apps or choose a smaller model."
+                        .into(),
+            },
+            detail: None,
+        },
         LocalLlamaFault::Timeout => AdapterFault::timeout(
             "model backend timed out",
             "local llama engine health deadline expired",
@@ -2216,6 +2242,20 @@ fn map_local_llama_fault(fault: LocalLlamaFault) -> AdapterFault {
     }
 }
 
+fn queued_local_cancelled() -> ReconcileResult {
+    ReconcileResult::Terminal {
+        events: Vec::new(),
+        status: RunStatus::Cancelled,
+        output: None,
+        error: Some(RunError {
+            class: ErrorClass::Cancelled,
+            code: "cancelled".into(),
+            message: "Model run was cancelled before execution.".into(),
+        }),
+        backend_report: None,
+    }
+}
+
 fn text_generation_request_body(
     offer: &ConfiguredOffer,
     model: &str,

capsules/model-provider/src/lib.rs

@@ -4,6 +4,7 @@ mod contract;
 mod execution;
 mod journal;
 mod local_llama;
+mod local_memory;
 mod process;
 mod state;
 #[cfg(test)]