bitpull 0.1.28 → 0.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitpull",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "description": "BitPull (bitpull.cloud): share signed, AI-readable code, computing power and open AI models with AI tools through MCP. CLI and MCP server.",
   "mcpName": "io.github.SamuealPK/bitpull",
   "bin": {

package/ui/ide-terminal.js

@@ -12,7 +12,7 @@ function register() {
   let current = null;
   const start = () => {
     if (term || !host || !opts || !opts.folder) return;
-    term = mountTerminal(host, { cwd: opts.folder, token: opts.token, t: opts.t, fontSize: opts.phone ? 12 : 13 });
+    term = mountTerminal(host, { cwd: opts.folder, token: opts.token, t: opts.t, fontSize: opts.phone ? 12 : 13, keep: !!opts.phone });
   };
   ide.terminal.register({
     mount(container, o) {

package/ui/terminal.js

@@ -88,11 +88,25 @@ export function mountTerminalSetting(el, { token, t = (k) => k, onChange } = {})
   terminalStatus(token).then(render, () => render({ enabled: false, available: false }));
 }
 
+/** This phone's name for its shells on the computer: the same every time the page opens. */
+function keptName() {
+  try {
+    let n = localStorage.getItem("bitpull_term_keep");
+    if (!n || !/^[A-Za-z0-9_-]{16,64}$/.test(n)) {
+      n = Array.from(crypto.getRandomValues(new Uint8Array(18)), (b) => b.toString(16).padStart(2, "0")).join("");
+      localStorage.setItem("bitpull_term_keep", n);
+    }
+    return n;
+  } catch {
+    return Array.from(crypto.getRandomValues(new Uint8Array(18)), (b) => b.toString(16).padStart(2, "0")).join("");
+  }
+}
+
 /**
  * Mounts the terminal in `el`. `cwd` must be a folder the person authorised; `t` translates.
  * Returns the controls the page and the Projects view use.
  */
-export function mountTerminal(el, { cwd, token, t = (k) => k, fontSize = 13 } = {}) {
+export function mountTerminal(el, { cwd, token, t = (k) => k, fontSize = 13, keep = false } = {}) {
   const ended = (code) => String(t("term.exited", { code })).replace("{code}", String(code));
   addCss();
   el.replaceChildren();
@@ -126,6 +140,9 @@ export function mountTerminal(el, { cwd, token, t = (k) => k, fontSize = 13 } =
   const waiting = new Map();
   let nextRef = 1;
   const byId = new Map();
+  // On a phone the shells wait on the computer for an hour when the phone goes away, under this name.
+  const keepName = keep ? keptName() : null;
+  let firstReady = true;
 
   const message = (key, withEnable) => {
     panesEl.replaceChildren();
@@ -201,11 +218,16 @@ export function mountTerminal(el, { cwd, token, t = (k) => k, fontSize = 13 } =
     return { term, fit, box, readonly };
   };
 
-  const startShell = (pane) => {
-    pane.ref = nextRef++;
-    pane.go = () => ws.send(JSON.stringify({ t: "open", ref: pane.ref, cwd, cols: pane.term.cols, rows: pane.term.rows }));
-    waiting.set(pane.ref, pane);
-    if (ready) pane.go();
+  const startShell = (pane, existing) => {
+    if (existing) {
+      pane.id = existing;
+      byId.set(existing, pane);
+    } else {
+      pane.ref = nextRef++;
+      pane.go = () => ws.send(JSON.stringify({ t: "open", ref: pane.ref, cwd, cols: pane.term.cols, rows: pane.term.rows }));
+      waiting.set(pane.ref, pane);
+      if (ready) pane.go();
+    }
     pane.term.onData((d) => {
       // "Ctrl" pressed on a phone's extra keys: the next letter becomes Ctrl+letter.
       if (ctrlNext && d.length === 1) {
@@ -224,7 +246,7 @@ export function mountTerminal(el, { cwd, token, t = (k) => k, fontSize = 13 } =
     if (ws && ws.readyState <= 1) return;
     ready = false;
     ws = new WebSocket(`${location.protocol === "https:" ? "wss" : "ws"}://${location.host}/api/terminal`);
-    ws.onopen = () => ws.send(JSON.stringify({ t: "auth", token }));
+    ws.onopen = () => ws.send(JSON.stringify({ t: "auth", token, ...(keepName ? { keep: keepName } : {}) }));
     ws.onmessage = (e) => {
       let m;
       try {
@@ -234,7 +256,14 @@ export function mountTerminal(el, { cwd, token, t = (k) => k, fontSize = 13 } =
       }
       if (m.t === "ready") {
         ready = true;
+        if (keepName) pickUp(m.kept || []);
         for (const p of waiting.values()) p.go();
+        if (keepName && firstReady && !tabs.length) newTab();
+        firstReady = false;
+      } else if (m.t === "attached") {
+        // The computer sends the screen again as it is now: it replaces what this page still showed.
+        byId.get(m.id)?.term.reset();
+        fitAll();
       } else if (m.t === "opened") {
         const p = waiting.get(m.ref);
         if (!p) return;
@@ -250,6 +279,14 @@ export function mountTerminal(el, { cwd, token, t = (k) => k, fontSize = 13 } =
           byId.delete(m.id);
           p.id = undefined;
         }
+      } else if (m.t === "error" && m.error === "no_terminal" && typeof m.id === "number") {
+        // Gone while the phone was away (more than an hour, or the computer restarted).
+        const p = byId.get(m.id);
+        if (p) {
+          byId.delete(m.id);
+          p.id = undefined;
+          p.term.write(`\r\n\x1b[2m${t("term.gone")}\x1b[0m\r\n`);
+        }
       } else if (m.t === "error") {
         const p = waiting.get(m.ref);
         waiting.delete(m.ref);
@@ -260,6 +297,8 @@ export function mountTerminal(el, { cwd, token, t = (k) => k, fontSize = 13 } =
     ws.onclose = (e) => {
       ready = false;
       if (disposed) return;
+      // A phone's connection comes back by itself: its shells are still there.
+      if (keepName && e.code !== 4409 && e.code !== 4410 && e.code !== 4401) setTimeout(() => !disposed && connect(), 2000);
       if (e.code === 4409 || e.code === 1006) {
         terminalStatus(token).then((s) => {
           if (!s.available) message("term.unavailable", false);
@@ -269,6 +308,20 @@ export function mountTerminal(el, { cwd, token, t = (k) => k, fontSize = 13 } =
     };
   };
 
+  /** Shows again the shells this phone left running: those of this page first, then the others in this folder. */
+  function pickUp(kept) {
+    for (const p of byId.values()) ws.send(JSON.stringify({ t: "attach", id: p.id, cols: p.term.cols, rows: p.term.rows }));
+    for (const k of kept) {
+      if (byId.has(k.id) || k.cwd !== cwd) continue;
+      const pane = makePane(false);
+      const tab = { title: "", panes: [pane] };
+      tabs.push(tab);
+      show(tab);
+      startShell(pane, k.id);
+      ws.send(JSON.stringify({ t: "attach", id: k.id, cols: pane.term.cols, rows: pane.term.rows }));
+    }
+  }
+
   function newTab() {
     const pane = makePane(false);
     const tab = { title: "", panes: [pane] };
@@ -337,7 +390,7 @@ export function mountTerminal(el, { cwd, token, t = (k) => k, fontSize = 13 } =
   bar.append(tabsEl, button("term.new", "tip.term.new", () => newTab()), button("term.split", "tip.term.split", () => split()), button("term.close", "tip.term.close", () => close()));
   const resize = new ResizeObserver(() => fitAll());
   resize.observe(panesEl);
-  // Closing the page ends its shells: the server closes them with the connection too.
+  // Closing the page ends its shells: the server closes them with the connection too. A phone's wait an hour.
   window.addEventListener("pagehide", dispose);
 
   terminalStatus(token).then(
@@ -346,7 +399,8 @@ export function mountTerminal(el, { cwd, token, t = (k) => k, fontSize = 13 } =
       if (!s.available) return message("term.unavailable", false);
       if (!s.enabled) return message("term.off", true);
       connect();
-      newTab();
+      // On a phone, the first answer says whether shells are waiting; a new one opens only if none is.
+      if (!keepName) newTab();
     },
     () => message("term.failed", false),
   );