pi-landstrip 0.18.21 → 0.18.22

package/dist/index.ts

@@ -94,6 +94,7 @@ import {
   SessionManager
 } from "@earendil-works/pi-coding-agent";
 import {
+  decodeKittyPrintable,
   matchesKey,
   Text,
   truncateToWidth as truncateToWidth2,
@@ -1609,17 +1610,16 @@ var AGENTS_HELP_ROWS = [
   ["F", "Toggle task log follow"],
   ["Page Up / Down", "Scroll task output by page"],
   ["Home / End", "Jump to task output boundary"],
-  ["Enter", "Open log, set primary, or save"],
-  ["Esc", "Back or close"],
+  ["Enter", "Open log, set primary, or edit setting"],
+  ["Esc", "Cancel edit, go back, or close"],
   ["Ctrl+C", "Close"],
-  ["Space", "Enable agent or toggle sandbox"],
+  ["Ctrl+D", "Delete selected task sessions"],
+  ["Space", "Enable agent or select task"],
   ["E", "Edit project agent"],
   ["X", "Delete project agent"],
   ["Y / N", "Confirm or cancel deletion"],
-  ["I", "Use global value"],
-  ["R", "Discard setting changes"],
-  ["0-9 / + / -", "Set subagent limit"],
-  ["Backspace", "Open parent task"]
+  ["Empty + Enter", "Use global setting in Project scope"],
+  ["Backspace", "Open parent task or edit setting"]
 ];
 var MIN_SUPPORTED_PI_VERSION = [0, 82, 0];
 var cachedPiPackage;
@@ -1693,6 +1693,10 @@ function readPiPackage(pkgPath) {
     return;
   }
 }
+function isControlChar(char) {
+  const code = char.charCodeAt(0);
+  return code < 32 || code === 127 || code >= 128 && code <= 159;
+}
 var taskParameters = Type.Object({
   description: Type.String({ description: "Short task label (3-5 words)" }),
   prompt: Type.String({ description: "Full instructions for the subagent" }),
@@ -2406,10 +2410,11 @@ ${this.primaryAgent.prompt}` };
       return;
     }
     let selectedSetting = 0;
-    const dirtySettings = new Set;
+    let settingEditor;
     let saving = false;
-    let editing = false;
     let confirmingDeleteAgent;
+    let pendingTaskAction;
+    const selectedTaskIds = new Set;
     let follow = requested.length > 0;
     let scroll = 0;
     const reloadAgents = () => {
@@ -2429,9 +2434,21 @@ ${this.primaryAgent.prompt}` };
     const refreshTasks = () => {
       const selectedId = tasks[selectedTask]?.id;
       tasks = [...this.tasks.values()];
+      const visibleTaskIds = new Set(tasks.map((task) => task.id));
+      for (const taskId of selectedTaskIds) {
+        if (!visibleTaskIds.has(taskId))
+          selectedTaskIds.delete(taskId);
+      }
       const nextSelected = selectedId ? tasks.findIndex((task) => task.id === selectedId) : selectedTask;
       selectedTask = Math.max(0, Math.min(nextSelected < 0 ? 0 : nextSelected, tasks.length - 1));
     };
+    const taskTargets = () => {
+      const selected = tasks.filter((task2) => selectedTaskIds.has(task2.id));
+      if (selected.length > 0)
+        return selected;
+      const task = tasks[selectedTask];
+      return task ? [task] : [];
+    };
     const refreshAgentRuntime = async (name) => {
       reloadAgents();
       if (this.primaryAgent?.name === name) {
@@ -2442,15 +2459,9 @@ ${this.primaryAgent.prompt}` };
     };
     const scopedAgent = (agent) => scope === "global" ? globalCatalog.agents.get(agent.name) : agent;
     const selectedMaxSubagents = () => scope === "global" ? maxSubagentsSettings.global : maxSubagentsSettings.project ?? maxSubagentsSettings.global;
-    const updateSelectedMaxSubagents = (value) => {
-      maxSubagentsSettings = scope === "global" ? { ...maxSubagentsSettings, global: value } : { ...maxSubagentsSettings, project: value };
-      dirtySettings.add(0);
-    };
+    const settingField = (setting) => setting === 0 ? "maxSubagents" : "sandboxEnabled";
+    const settingLabel = (settingScope, field) => `${settingScope === "global" ? "Global" : "Project"} ${field}`;
     const selectedSandboxEnabled = () => scope === "global" ? sandboxSettings.global : sandboxSettings.project ?? sandboxSettings.global;
-    const updateSelectedSandboxEnabled = (value) => {
-      sandboxSettings = scope === "global" ? { ...sandboxSettings, global: value } : { ...sandboxSettings, project: value };
-      dirtySettings.add(1);
-    };
     await ctx.ui.custom((tui, theme, _keybindings, done) => ({
       render: (width) => {
         const contentWidth = Math.max(1, width - 4);
@@ -2548,27 +2559,33 @@ ${this.primaryAgent.prompt}` };
           const sandboxInherited = scope === "project" && sandboxSettings.project === undefined;
           const rows = [
             {
-              label: "Maximum subagents",
+              label: "maxSubagents",
               value: String(selectedMaxSubagents()),
               inherited: maxSubagentsInherited,
               unavailable: false
             },
             {
-              label: "Sandbox enabled",
+              label: "sandboxEnabled",
               value: selectedSandboxEnabled() ? "on" : "off",
               inherited: sandboxInherited,
               unavailable: sandboxCallbacks === undefined
             }
           ];
           const lines2 = [tabs, ""];
+          if (settingEditor) {
+            const current = settingEditor.setting === 0 ? String(selectedMaxSubagents()) : selectedSandboxEnabled() ? "on" : "off";
+            lines2.push(theme.fg("dim", `  ${settingLabel(settingEditor.scope, settingEditor.field)} · current ${current}`), "", `  ${theme.fg("accent", "›")} [ ${settingEditor.value}${theme.fg("accent", "█")} ]`, "", theme.fg("dim", settingEditor.scope === "project" ? "  empty inherit  ·  enter submit  ·  esc cancel" : "  enter submit  ·  esc cancel"));
+            if (saving)
+              lines2.push("", theme.fg("dim", "Saving…"));
+            return box(lines2);
+          }
           for (const [index, row] of rows.entries()) {
             const selected = index === selectedSetting;
             const cursor = selected ? theme.fg("accent", "›") : " ";
             const text = `[ ${row.value} ]`;
             const value = row.inherited ? theme.fg("dim", text) : selected ? theme.fg("accent", text) : theme.fg(row.unavailable ? "muted" : "text", text);
             const label = theme.fg(row.unavailable ? "muted" : "text", row.label);
-            const dirty = dirtySettings.has(index) ? theme.fg("warning", " *") : "";
-            lines2.push(`${cursor} ${value} ${label}${dirty}`);
+            lines2.push(`${cursor} ${value} ${label}`);
           }
           if (selectedSetting === 1) {
             lines2.push("", theme.fg("dim", rows[1]?.inherited ? "Controls OS sandboxing. Use /sandbox to inspect its policy. Using the Global value." : "Controls OS sandboxing. Use /sandbox to inspect its policy."));
@@ -2598,10 +2615,23 @@ ${this.primaryAgent.prompt}` };
             for (const [offset, task2] of shown2.entries()) {
               const index = start + offset;
               const cursor = index === selectedTask ? theme.fg("accent", "›") : " ";
+              const selected = selectedTaskIds.has(task2.id) ? theme.fg("accent", "✓") : " ";
               const indent = "  ".repeat(Math.max(0, task2.depth - 1));
-              listLines.push(`${cursor} ${indent}${taskState(theme, task2)} ${theme.fg("accent", `@${task2.agent}`)} ${theme.fg("text", task2.description)} ${theme.fg("dim", task2.id.slice(0, 8))}`);
+              listLines.push(`${cursor} ${selected} ${indent}${taskState(theme, task2)} ${theme.fg("accent", `@${task2.agent}`)} ${theme.fg("text", task2.description)} ${theme.fg("dim", task2.id.slice(0, 8))}`);
             }
           }
+          const selectedCount = tasks.filter((task2) => selectedTaskIds.has(task2.id)).length;
+          if (selectedCount > 0) {
+            listLines.push("", theme.fg("dim", `${selectedCount} selected`));
+          }
+          listLines.push("");
+          if (pendingTaskAction) {
+            const count = pendingTaskAction.taskIds.length;
+            const label = count === 1 ? `Delete ${pendingTaskAction.taskIds[0]?.slice(0, 8) ?? "task"}?` : `Delete ${count} selected task sessions?`;
+            listLines.push(`${theme.fg("warning", label)} ${theme.fg("dim", "enter confirm · esc cancel")}`);
+          } else {
+            listLines.push(theme.fg("dim", "↑↓ move · space select · enter inspect · ctrl+d delete · esc close"));
+          }
           return box([tabs, "", ...listLines]);
         }
         const task = tasks[selectedTask];
@@ -2663,29 +2693,22 @@ ${this.primaryAgent.prompt}` };
           }
           return;
         }
-        if ((matchesKey(data, "shift+tab") || data.toLowerCase() === "s") && (tab === "primary" || tab === "subagent" || tab === "settings")) {
+        if ((matchesKey(data, "shift+tab") || data.toLowerCase() === "s") && (tab === "primary" || tab === "subagent" || tab === "settings") && settingEditor === undefined) {
           if (saving)
             return;
-          if (dirtySettings.size > 0) {
-            ctx.ui.notify("Save or discard settings changes before changing scope", "warning");
-            return;
-          }
           if (!projectTrusted && scope === "global") {
             ctx.ui.notify("Project settings require a trusted project", "warning");
             return;
           }
           scope = scope === "project" ? "global" : "project";
-          editing = false;
           reloadAgents();
           reloadSettings();
           tui.requestRender();
           return;
         }
         if (matchesKey(data, "tab")) {
-          if (tab === "settings" && dirtySettings.size > 0) {
-            ctx.ui.notify("Save changes with Enter or discard them with R before leaving", "warning");
+          if (settingEditor !== undefined)
             return;
-          }
           const selectedName = tab === "primary" || tab === "subagent" ? agentsForTab()[selectedAgent]?.name : undefined;
           const tabs = ["primary", "subagent", "tasks", "log", "settings", "help"];
           tab = tabs[(tabs.indexOf(tab) + 1) % tabs.length] ?? "primary";
@@ -2699,7 +2722,6 @@ ${this.primaryAgent.prompt}` };
             follow = true;
           else
             follow = false;
-          editing = false;
           scroll = 0;
           tui.requestRender();
           return;
@@ -2784,82 +2806,109 @@ ${this.primaryAgent.prompt}` };
         if (tab === "settings") {
           if (saving)
             return;
-          if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) {
-            if (dirtySettings.size > 0) {
-              ctx.ui.notify("Save changes with Enter or discard them with R before closing", "warning");
-              return;
-            }
+          if (matchesKey(data, "ctrl+c")) {
             done();
             return;
           }
-          if (data.toLowerCase() === "r") {
-            reloadSettings();
-            dirtySettings.clear();
-            editing = false;
+          if (settingEditor) {
+            if (matchesKey(data, "escape")) {
+              settingEditor = undefined;
+              tui.requestRender();
+              return;
+            }
+            if (matchesKey(data, "backspace")) {
+              settingEditor.value = settingEditor.value.slice(0, -1);
+              tui.requestRender();
+              return;
+            }
+            if (matchesKey(data, "return")) {
+              const editor = settingEditor;
+              const input = editor.value.trim();
+              let save;
+              let notifyMessage;
+              if (input === "") {
+                if (editor.scope !== "project") {
+                  settingEditor = undefined;
+                  tui.requestRender();
+                  return;
+                }
+                save = editor.setting === 0 ? clearMaxSubagentsConfigForScope(ctx.cwd, "project") : sandboxCallbacks?.clearProject(ctx);
+                notifyMessage = `${settingLabel(editor.scope, editor.field)} inherits Global`;
+              } else if (editor.setting === 0) {
+                if (!/^\d+$/.test(input)) {
+                  ctx.ui.notify(`Enter a whole number between 0 and ${MAX_SUBAGENTS}`, "error");
+                  return;
+                }
+                const parsed = Number(input);
+                if (!Number.isSafeInteger(parsed) || parsed < 0 || parsed > MAX_SUBAGENTS) {
+                  ctx.ui.notify(`Enter a whole number between 0 and ${MAX_SUBAGENTS}`, "error");
+                  return;
+                }
+                save = setMaxSubagentsConfigForScope(ctx.cwd, parsed, editor.scope);
+                notifyMessage = `${settingLabel(editor.scope, editor.field)} = ${parsed}`;
+              } else {
+                const normalized = input.toLowerCase();
+                const parsed = ["1", "on", "true", "yes"].includes(normalized) ? true : ["0", "off", "false", "no"].includes(normalized) ? false : undefined;
+                if (parsed === undefined) {
+                  ctx.ui.notify("Enter on/off, true/false, or 1/0", "error");
+                  return;
+                }
+                save = sandboxCallbacks?.setEnabled(ctx, parsed, editor.scope);
+                notifyMessage = `${settingLabel(editor.scope, editor.field)} = ${parsed ? "on" : "off"}`;
+              }
+              if (!save) {
+                ctx.ui.notify("Sandbox settings are unavailable", "warning");
+                return;
+              }
+              saving = true;
+              settingEditor = undefined;
+              tui.requestRender();
+              save.then(() => {
+                reloadSettings();
+                const loadedMaxSubagents = loadMaxSubagentsSettings(ctx.cwd, projectTrusted);
+                this.setMaxSubagents(loadedMaxSubagents.project ?? loadedMaxSubagents.global);
+                maxSubagentsSettings = loadedMaxSubagents;
+                sandboxSettings = sandboxCallbacks?.load(ctx.cwd, projectTrusted) ?? {
+                  global: true
+                };
+                ctx.ui.notify(notifyMessage ?? "Setting updated", "info");
+              }).catch((error) => ctx.ui.notify(`Could not save setting: ${formatError(error)}`, "error")).finally(() => {
+                saving = false;
+                tui.requestRender();
+              });
+              return;
+            }
+            const kittyChar = decodeKittyPrintable(data);
+            const printable = kittyChar ?? (data.length === 1 && !isControlChar(data) ? data : undefined);
+            if (printable === undefined)
+              return;
+            if (settingEditor.setting === 0 && !/^\d$/.test(printable))
+              return;
+            if (settingEditor.setting === 1 && !/^[a-zA-Z0-9]$/.test(printable))
+              return;
+            settingEditor.value += printable;
             tui.requestRender();
             return;
           }
-          if (matchesKey(data, "up")) {
+          if (matchesKey(data, "escape")) {
+            done();
+            return;
+          }
+          if (matchesKey(data, "up"))
             selectedSetting = Math.max(0, selectedSetting - 1);
-            editing = false;
-          } else if (matchesKey(data, "down")) {
+          else if (matchesKey(data, "down"))
             selectedSetting = Math.min(1, selectedSetting + 1);
-            editing = false;
-          } else if (selectedSetting === 0 && /^[0-9]$/.test(data)) {
-            const value = Number(editing ? `${selectedMaxSubagents()}${data}` : data);
-            if (value <= MAX_SUBAGENTS) {
-              updateSelectedMaxSubagents(value);
-              editing = true;
-            }
-          } else if (selectedSetting === 0 && (data === "+" || data === "-")) {
-            updateSelectedMaxSubagents(Math.min(MAX_SUBAGENTS, Math.max(0, selectedMaxSubagents() + (data === "+" ? 1 : -1))));
-            editing = false;
-          } else if (selectedSetting === 1 && data === " " && sandboxCallbacks) {
-            updateSelectedSandboxEnabled(!selectedSandboxEnabled());
-            editing = false;
-          } else if (data === "i" && scope === "project") {
-            if (selectedSetting === 0) {
-              maxSubagentsSettings = { ...maxSubagentsSettings, project: undefined };
-            } else {
-              sandboxSettings = { ...sandboxSettings, project: undefined };
-            }
-            dirtySettings.add(selectedSetting);
-            editing = false;
-          } else if (matchesKey(data, "return")) {
-            const setting = selectedSetting;
-            if (!dirtySettings.has(setting))
-              return;
-            const pendingMaxSubagents = maxSubagentsSettings;
-            const pendingSandbox = sandboxSettings;
-            const inherited = scope === "project" && (setting === 0 ? pendingMaxSubagents.project === undefined : pendingSandbox.project === undefined);
-            const maxSubagents = selectedMaxSubagents();
-            const sandboxEnabled = selectedSandboxEnabled();
-            let save;
-            if (setting === 0) {
-              save = inherited ? clearMaxSubagentsConfigForScope(ctx.cwd, "project") : setMaxSubagentsConfigForScope(ctx.cwd, maxSubagents, scope);
-            } else if (!sandboxCallbacks) {
+          else if (matchesKey(data, "return")) {
+            if (selectedSetting === 1 && !sandboxCallbacks) {
               ctx.ui.notify("Sandbox settings are unavailable", "warning");
               return;
-            } else {
-              save = inherited ? sandboxCallbacks.clearProject(ctx) : sandboxCallbacks.setEnabled(ctx, sandboxEnabled, scope);
             }
-            saving = true;
-            save.then(() => {
-              dirtySettings.delete(setting);
-              const loadedMaxSubagents = loadMaxSubagentsSettings(ctx.cwd, projectTrusted);
-              const loadedSandbox = sandboxCallbacks?.load(ctx.cwd, projectTrusted) ?? {
-                global: true
-              };
-              this.setMaxSubagents(loadedMaxSubagents.project ?? loadedMaxSubagents.global);
-              maxSubagentsSettings = dirtySettings.has(0) ? pendingMaxSubagents : loadedMaxSubagents;
-              sandboxSettings = dirtySettings.has(1) ? pendingSandbox : loadedSandbox;
-              editing = false;
-              ctx.ui.notify(inherited ? `${setting === 0 ? "Maximum subagents" : "Sandbox"} now uses the global value` : `${setting === 0 ? "Maximum subagents" : "Sandbox"} updated in ${scope} settings`, "info");
-            }).catch((error) => ctx.ui.notify(`Could not save setting: ${formatError(error)}`, "error")).finally(() => {
-              saving = false;
-              tui.requestRender();
-            });
-            return;
+            settingEditor = {
+              setting: selectedSetting,
+              scope,
+              field: settingField(selectedSetting),
+              value: ""
+            };
           } else
             return;
           tui.requestRender();
@@ -2871,12 +2920,46 @@ ${this.primaryAgent.prompt}` };
           return;
         }
         if (tab === "tasks") {
+          if (pendingTaskAction) {
+            if (matchesKey(data, "return")) {
+              const taskIds = pendingTaskAction.taskIds;
+              pendingTaskAction = undefined;
+              const deleted = this.deleteTasks(taskIds, ctx);
+              for (const taskId of taskIds)
+                selectedTaskIds.delete(taskId);
+              refreshTasks();
+              if (deleted > 0) {
+                ctx.ui.notify(`Deleted ${deleted} task session${deleted === 1 ? "" : "s"}`, "info");
+              }
+              tui.requestRender();
+              return;
+            }
+            if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) {
+              pendingTaskAction = undefined;
+              tui.requestRender();
+            }
+            return;
+          }
           if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c"))
             done();
           else if (matchesKey(data, "up"))
             selectedTask = Math.max(0, selectedTask - 1);
           else if (matchesKey(data, "down") && tasks.length > 0) {
             selectedTask = Math.min(tasks.length - 1, selectedTask + 1);
+          } else if (data === " ") {
+            const task2 = tasks[selectedTask];
+            if (!task2)
+              return;
+            if (!selectedTaskIds.delete(task2.id))
+              selectedTaskIds.add(task2.id);
+          } else if (matchesKey(data, "ctrl+d")) {
+            const targets = taskTargets();
+            if (targets.length === 0)
+              return;
+            pendingTaskAction = {
+              type: "delete",
+              taskIds: targets.map((task2) => task2.id)
+            };
           } else if (matchesKey(data, "return") && tasks.length > 0) {
             tab = "log";
             follow = true;
@@ -3735,6 +3818,25 @@ ${renderTaskResult(task.id, "error", message)}`);
       invalidate() {}
     }));
   }
+  deleteTasks(taskIds, ctx) {
+    let deleted = 0;
+    for (const taskId of taskIds) {
+      const task = this.tasks.get(taskId);
+      if (!task)
+        continue;
+      task.deleted = true;
+      task.delivered = true;
+      this.controllers.get(taskId)?.abort();
+      this.tasks.delete(taskId);
+      this.pendingPrompts.delete(taskId);
+      this.foregroundClaims.delete(taskId);
+      this.persist(task);
+      deleted += 1;
+    }
+    if (deleted > 0)
+      this.updateTaskWidget(ctx);
+    return deleted;
+  }
   restore(ctx) {
     this.tasks.clear();
     for (const entry of ctx.sessionManager.getBranch()) {
@@ -3743,6 +3845,10 @@ ${renderTaskResult(task.id, "error", message)}`);
       const task = entry.data;
       if (!task?.id || task.parentSessionId !== ctx.sessionManager.getSessionId())
         continue;
+      if (task.deleted) {
+        this.tasks.delete(task.id);
+        continue;
+      }
       this.tasks.set(task.id, {
         ...task,
         usage: isTaskUsage(task.usage) ? { ...task.usage } : undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-landstrip",
-  "version": "0.18.21",
+  "version": "0.18.22",
   "description": "Sandboxed Bash and process-backed agents for Pi",
   "keywords": [
     "landstrip",
@@ -39,7 +39,7 @@
     "ci:test": "npm run test"
   },
   "dependencies": {
-    "@landstrip/landstrip": "^0.18.21",
+    "@landstrip/landstrip": "^0.18.22",
     "jsonc-parser": "^3.3.1",
     "minimatch": "^10.2.5",
     "yaml": "^2.9.0"