omnius 1.0.891 → 1.0.893

package/dist/tui/native/worker.js

@@ -1639,13 +1639,27 @@ function nativeMarkdownSections(owner, source, streaming = false) {
   return segmented ? output : void 0;
 }
 
-// packages/cli/src/tui/native/components/blocks.ts
-function nativeProgressText(value, working = false) {
-  if (value === void 0 || !Number.isFinite(value)) return `[············] ${working ? "working" : "pending"}`;
+// packages/cli/src/tui/native/activity-presentation.ts
+function nativeProgressText(value, _working = false) {
+  if (value === void 0 || !Number.isFinite(value)) return "";
   const ratio = Math.max(0, Math.min(1, value));
   const filled = Math.round(ratio * 12);
   return `[${"▮".repeat(filled)}${"░".repeat(12 - filled)}] ${Math.round(ratio * 100)}%`;
 }
+function nativeActivityText(activity, runtimeStatus) {
+  const stage = activity?.stage?.trim().replace(/_/g, " ") ?? "";
+  const label3 = activity?.label?.trim() ?? "";
+  if (/^(?:blocked|failed|error|awaiting input|waiting|paused|interrupted|stopped)(?:\b|$)/i.test(stage)) {
+    return [stage.toUpperCase(), label3.toLowerCase() === stage.toLowerCase() ? "" : label3].filter(Boolean).join(" · ");
+  }
+  if (!activity?.operationId && activity?.progress !== void 0 && Number.isFinite(activity.progress)) {
+    const percent = Math.round(Math.max(0, Math.min(1, activity.progress)) * 100);
+    return [label3, `${percent}%`].filter(Boolean).join(" · ");
+  }
+  return runtimeStatus?.trim() ?? "";
+}
+
+// packages/cli/src/tui/native/components/blocks.ts
 function nativeControlFocus(control, baseAttributes = 0) {
   const update = () => {
     if (!control.isDestroyed) control.attributes = baseAttributes | (control.focused ? 32 : 0);
@@ -1921,11 +1935,7 @@ var NativeBlockView = class {
       this.collapsed = spec.collapsed ?? false;
       this.previousModelCollapsed = spec.collapsed;
     }
-    if (this.title) {
-      this.title.content = `${spec.collapsible ? this.collapsed ? "▸ " : "· " : ""}${plainText(spec.title)}`;
-      this.title.focusable = Boolean(spec.collapsible);
-    }
-    if (this.body) this.body.visible = !this.collapsed;
+    this.syncDisclosure();
     const sections = spec.kind === "markdown" ? nativeMarkdownSections(spec.id, plainText(spec.text), spec.streaming) : void 0;
     if (this.text && spec.kind === "markdown") this.text.visible = !sections;
     if (sections && this.body) {
@@ -1948,7 +1958,11 @@ var NativeBlockView = class {
     if (this.image && spec.imagePath && this.image.source !== spec.imagePath) this.image.source = spec.imagePath;
     if (this.terminal) this.terminal.height = spec.height ?? 14;
     if (this.image) this.image.height = spec.height ?? 12;
-    if (this.progress) this.progress.content = nativeProgressText(spec.progress, spec.streaming);
+    if (this.progress) {
+      const meter = nativeProgressText(spec.progress, spec.streaming);
+      this.progress.content = meter;
+      this.progress.visible = Boolean(meter);
+    }
     this.children?.replace(spec.children ?? []);
     const actionsSignature = JSON.stringify(spec.actions ?? []);
     if (this.actions && actionsSignature !== this.actionsSignature) {
@@ -1988,10 +2002,26 @@ var NativeBlockView = class {
   }
   toggle() {
     this.collapsed = !this.collapsed;
-    if (this.body) this.body.visible = !this.collapsed;
-    if (this.title) this.title.content = `${this.collapsed ? "▸ " : "· "}${plainText(this.spec.title)}`;
+    this.syncDisclosure();
     this.context.emit({ type: "action", action: "toggle-block", id: this.spec.id });
   }
+  syncDisclosure() {
+    if (this.body) this.body.visible = !this.collapsed;
+    if (!this.title) return;
+    const title = plainText(this.spec.title);
+    const lineDisclosure = /^\+ \d+ lines?$/.test(title);
+    const label3 = this.spec.collapsible && !this.collapsed && lineDisclosure ? title.replace(/^\+/, "−") : title;
+    this.title.content = `${this.spec.collapsible ? this.collapsed ? "▸ " : "▾ " : ""}${label3}`;
+    this.title.focusable = Boolean(this.spec.collapsible);
+    const children = this.root.getChildren();
+    const position = this.spec.collapsible && !this.collapsed && (this.spec.disclosurePlacement === "footer" || lineDisclosure) ? children.length - 1 : 0;
+    if (children.indexOf(this.title) !== position) {
+      const focused = this.title.focused;
+      this.root.remove(this.title);
+      this.root.add(this.title, position);
+      if (focused) this.title.focus();
+    }
+  }
   captureDisclosures(result) {
     if (this.spec.collapsible) Object.defineProperty(result, this.spec.id, { value: this.collapsed, enumerable: true, configurable: true, writable: true });
     this.children?.captureDisclosures(result);
@@ -2000,8 +2030,7 @@ var NativeBlockView = class {
   restoreDisclosures(state) {
     if (this.spec.collapsible && Object.hasOwn(state, this.spec.id)) {
       this.collapsed = state[this.spec.id];
-      if (this.body) this.body.visible = !this.collapsed;
-      if (this.title) this.title.content = `${this.collapsed ? "▸ " : "· "}${plainText(this.spec.title)}`;
+      this.syncDisclosure();
     }
     this.children?.restoreDisclosures(state);
     this.markdownSections?.restoreDisclosures(state);
@@ -6110,7 +6139,7 @@ var COMMAND_SIGNATURES = [
   ["/wizard", "Alias for /setup"],
   ["/parallel", "Show current Ollama parallel inference slots"],
   ["/parallel <1-15>", "Set parallel slots (restarts Ollama, max 15)"],
-  ["/gpu", "Select enabled GPUs with arrow keys and Space"],
+  ["/gpu", "Select enabled GPUs and CPU offload with arrow keys and Space"],
   ["/gpu status|reset", "Inspect or reset the host-local GPU policy"],
   ["/gpu select <UUID>", "Open the GPU policy selector focused on a device"],
   [
@@ -8683,14 +8712,9 @@ var NativeFrontend = class {
     this.replaceActions(this.enhance, actions, "enhance");
   }
   renderActivity() {
-    const activity = this.state?.activity;
-    const stage = activity?.stage === "idle" ? void 0 : activity?.stage?.replace(/_/g, " ").toUpperCase();
-    const label3 = activity?.label && activity.label.toUpperCase() !== stage ? activity.label : void 0;
-    const elapsed = activity?.elapsedMs === void 0 ? void 0 : `${Math.max(0, Math.floor(activity.elapsedMs / 1e3))}s`;
-    const progress = activity?.progress === void 0 ? void 0 : `${Math.round(activity.progress * 100)}% source accounted`;
-    const reading = [stage, label3, elapsed, progress].filter(Boolean).join(" · ") || this.state?.instruments?.runtimeStatus || "";
-    this.activity.visible = Boolean(activity?.processing || reading);
-    this.activity.content = `${activity?.processing ? "RUN · " : ""}${reading}`;
+    const reading = nativeActivityText(this.state?.activity, this.state?.instruments?.runtimeStatus);
+    this.activity.visible = Boolean(reading);
+    this.activity.content = reading;
     this.status.visible = this.activity.visible || this.media.visible || this.copyFeedback.visible;
   }
   renderMedia() {