@cydm/pie 1.0.47 → 1.0.48

package/README.md

@@ -218,7 +218,10 @@ Pie uses a hierarchical slash-command menu. The current built-in commands includ
 | `pie doctor [--json]` | Diagnose local config, model setup, writable paths, browser automation, and Unity bridge hints |
 | `pie models init` | Create a starter `~/.pie/models.json` |
 | `pie models validate` | Validate `~/.pie/models.json` |
-| `pie permissions` | Explain tool and shell safety defaults |
+| `pie permissions` | Explain tool and shell safety defaults (`--json` returns the structured safety model) |
+| `pie capabilities [--json]` | Report the command surface, flags, exit codes, and output schema for agents |
+| `pie sessions list/read/rename/rewind/fork` | Inspect and manage stored sessions non-interactively (each supports `--json` and `--help`) |
+| `pie extensions list/enable/disable` | Inspect and toggle extensions non-interactively |
 | `/sessions/compact` | Summarize history and create a compact checkpoint |
 | `/sessions/new` | Start a new session |
 | `/sessions/resume` | Resume a different session |
@@ -355,6 +358,23 @@ pie "summarize this file" --json-output
 pie "continue previous task" --session-id my-session
 ```
 
+### Machine-Readable Output (Agents And Hosts)
+
+Every management command (`sessions`, `doctor`, `models`, `extensions`, `permissions`, `capabilities`) emits one compact JSON envelope when given `--json`:
+
+```json
+{"v":1,"ok":true,"kind":"sessions.list","data":[...],"meta":{"count":10,"total":42,"nextCursor":"..."},"help":["..."]}
+```
+
+- `v` is a constant output-schema generation marker; `kind` identifies the command.
+- `meta` carries pagination (`nextCursor`) and aggregates; `help[]` lists concrete next steps when they exist and never duplicates large payloads.
+- Errors are structured on stdout: `{"v":1,"ok":false,"kind":"...","error":{"code":"session_not_found","message":"...","hint":"..."}}`.
+- Exit codes: `0` success, `1` business failure, `2` usage error. Unknown flags fail loudly; every subcommand supports `--help`.
+- `sessions list --json` defaults to the current project (`--all` lists every project). Rows are minimal (`id`, `name`, `updatedAt`, `count`) with `--fields` and `--full` opt-ins; `sessions read` truncates content by default with the same opt-ins.
+- JSONL protocol mode (`--json-events`) identifies entries by `entryId` only (the legacy `checkpointId` alias is gone) and caps large tool results and turn summaries by default; pass `--event-detail full` for untruncated payloads. Truncation always carries `truncated`/`fullLength` markers.
+
+Run `pie capabilities --json` to discover the full command surface, flags, and exit-code contract programmatically.
+
 ## Terminal Notes
 
 For the best multiline editing experience, use a terminal with good modified-key support, such as:

package/dist/cli.js

@@ -51654,6 +51654,33 @@ var SelectList = class {
   }
   invalidate() {
   }
+  /**
+   * Lay out one item row: label (left column) + description (right column).
+   *
+   * The label column is sized from the actual labels and the available
+   * width. The previous fixed 30-column cap truncated long commands (e.g.
+   * /skills/skill:terminal-pty-testing) even on wide terminals.
+   */
+  renderLabelParts(prefix, displayValue, descriptionSingleLine, useDescriptionColumn, labelColumnWidth, width) {
+    const prefixWidth = visibleWidth(prefix);
+    if (useDescriptionColumn && descriptionSingleLine) {
+      const truncatedValue = truncateToWidth(displayValue, labelColumnWidth, "");
+      const valueWidth = visibleWidth(truncatedValue);
+      const spacing = " ".repeat(Math.max(1, labelColumnWidth - valueWidth + 2));
+      const descriptionStart = prefixWidth + valueWidth + spacing.length;
+      const remainingWidth = width - descriptionStart - 2;
+      if (remainingWidth > 10) {
+        return {
+          value: truncatedValue,
+          spacing,
+          desc: truncateToWidth(descriptionSingleLine, remainingWidth, "")
+        };
+      }
+      return { value: truncateToWidth(displayValue, width - prefixWidth - 2, ""), spacing: "", desc: "" };
+    }
+    const maxWidth = width - prefixWidth - 2;
+    return { value: truncateToWidth(displayValue, maxWidth, ""), spacing: "", desc: "" };
+  }
   render(width) {
     const lines = [];
     if (this.filteredItems.length === 0) {
@@ -51661,54 +51688,35 @@ var SelectList = class {
       return lines;
     }
     const { startIndex, endIndex } = this.getVisibleRange();
+    const useDescriptionColumn = this.filteredItems.some((item) => item.description) && width > 40;
+    let labelColumnWidth = 0;
+    if (useDescriptionColumn) {
+      const maxLabelWidth = Math.max(
+        ...this.filteredItems.map((item) => visibleWidth(item.label || item.value))
+      );
+      labelColumnWidth = Math.max(8, Math.min(maxLabelWidth, Math.floor(width * 0.45)));
+    }
     for (let i = startIndex; i < endIndex; i++) {
       const item = this.filteredItems[i];
       if (!item) continue;
       const isSelected = i === this.selectedIndex;
       const descriptionSingleLine = item.description ? normalizeToSingleLine(item.description) : void 0;
+      const displayValue = item.label || item.value;
       let line = "";
       if (isSelected) {
-        const prefixWidth = 2;
-        const displayValue = item.label || item.value;
-        if (descriptionSingleLine && width > 40) {
-          const maxValueWidth = Math.min(30, width - prefixWidth - 4);
-          const truncatedValue = truncateToWidth(displayValue, maxValueWidth, "");
-          const valueWidth = visibleWidth(truncatedValue);
-          const spacing = " ".repeat(Math.max(1, 32 - valueWidth));
-          const descriptionStart = prefixWidth + valueWidth + spacing.length;
-          const remainingWidth = width - descriptionStart - 2;
-          if (remainingWidth > 10) {
-            const truncatedDesc = truncateToWidth(descriptionSingleLine, remainingWidth, "");
-            line = truncateToWidth(this.theme.selectedText(`\u2192 ${truncatedValue}${spacing}${truncatedDesc}`), width, "");
-          } else {
-            const maxWidth = width - prefixWidth - 2;
-            line = truncateToWidth(this.theme.selectedText(`\u2192 ${truncateToWidth(displayValue, maxWidth, "")}`), width, "");
-          }
-        } else {
-          const maxWidth = width - prefixWidth - 2;
-          line = truncateToWidth(this.theme.selectedText(`\u2192 ${truncateToWidth(displayValue, maxWidth, "")}`), width, "");
-        }
+        const parts = this.renderLabelParts("\u2192 ", displayValue, descriptionSingleLine, useDescriptionColumn, labelColumnWidth, width);
+        line = truncateToWidth(
+          this.theme.selectedText(`\u2192 ${parts.value}${parts.spacing}${parts.desc}`),
+          width,
+          ""
+        );
       } else {
-        const displayValue = item.label || item.value;
-        const prefix = "  ";
-        if (descriptionSingleLine && width > 40) {
-          const maxValueWidth = Math.min(30, width - prefix.length - 4);
-          const truncatedValue = truncateToWidth(displayValue, maxValueWidth, "");
-          const valueWidth = visibleWidth(truncatedValue);
-          const spacing = " ".repeat(Math.max(1, 32 - valueWidth));
-          const descriptionStart = prefix.length + valueWidth + spacing.length;
-          const remainingWidth = width - descriptionStart - 2;
-          if (remainingWidth > 10) {
-            const truncatedDesc = truncateToWidth(descriptionSingleLine, remainingWidth, "");
-            const descText = this.theme.description(spacing + truncatedDesc);
-            line = truncateToWidth(prefix + truncatedValue + descText, width, "");
-          } else {
-            const maxWidth = width - prefix.length - 2;
-            line = truncateToWidth(prefix + truncateToWidth(displayValue, maxWidth, ""), width, "");
-          }
+        const parts = this.renderLabelParts("  ", displayValue, descriptionSingleLine, useDescriptionColumn, labelColumnWidth, width);
+        if (parts.desc) {
+          const descText = this.theme.description(parts.spacing + parts.desc);
+          line = truncateToWidth("  " + parts.value + descText, width, "");
         } else {
-          const maxWidth = width - prefix.length - 2;
-          line = truncateToWidth(prefix + truncateToWidth(displayValue, maxWidth, ""), width, "");
+          line = truncateToWidth("  " + parts.value, width, "");
         }
       }
       lines.push(truncateToWidth(line, width, ""));
@@ -51847,6 +51855,13 @@ var Editor = class {
   autocompleteState = null;
   autocompletePrefix = "";
   autocompleteMaxVisible = 5;
+  /**
+   * Whether the user moved the autocomplete selection (arrows/paging).
+   * A bare "/" + Enter still submits the slash itself (root command menu),
+   * but once the user has actively highlighted an item, Enter must accept
+   * that selection instead of re-opening the same menu.
+   */
+  autocompleteListTouched = false;
   // Paste tracking for large pastes
   pastes = /* @__PURE__ */ new Map();
   pasteCounter = 0;
@@ -52083,6 +52098,12 @@ var Editor = class {
         return;
       }
       if (kb.matches(data, "selectUp") || kb.matches(data, "selectDown")) {
+        this.autocompleteListTouched = true;
+        this.autocompleteList.handleInput(data);
+        return;
+      }
+      if (kb.matches(data, "cursorLeft") || kb.matches(data, "cursorRight") || kb.matches(data, "pageUp") || kb.matches(data, "pageDown")) {
+        this.autocompleteListTouched = true;
         this.autocompleteList.handleInput(data);
         return;
       }
@@ -52108,7 +52129,7 @@ var Editor = class {
       }
       if (kb.matches(data, "selectConfirm")) {
         const currentLine = this.state.lines[this.state.cursorLine] || "";
-        const isBareSlashSubmit = this.state.lines.length === 1 && currentLine === "/" && this.state.cursorCol === 1;
+        const isBareSlashSubmit = !this.autocompleteListTouched && this.state.lines.length === 1 && currentLine === "/" && this.state.cursorCol === 1;
         if (isBareSlashSubmit) {
           this.cancelAutocomplete();
         } else {
@@ -53128,12 +53149,29 @@ var Editor = class {
     );
     if (suggestions && suggestions.items.length > 0) {
       this.autocompletePrefix = suggestions.prefix;
-      this.autocompleteList = new SelectList(suggestions.items, this.autocompleteMaxVisible, this.theme.selectList);
+      this.autocompleteListTouched = false;
+      this.autocompleteList = new SelectList(
+        suggestions.items,
+        this.computeAutocompleteMaxVisible(suggestions.items.length),
+        this.theme.selectList
+      );
       this.autocompleteState = "regular";
     } else {
       this.cancelAutocomplete();
     }
   }
+  /**
+   * Visible autocomplete rows, scaled with terminal height so tall screens
+   * show the full command list instead of paginating five rows at a time.
+   * Floor: the configured max (default 5). Ceiling: ~45% of rows, capped at
+   * 20 so a huge terminal never dedicates half the screen to suggestions.
+   */
+  computeAutocompleteMaxVisible(itemCount) {
+    const rows = this.tui.terminal.rows;
+    const heightScaled = Number.isFinite(rows) ? Math.floor(rows * 0.45) : this.autocompleteMaxVisible;
+    const desired = Math.max(this.autocompleteMaxVisible, Math.min(heightScaled, 20));
+    return Math.max(1, Math.min(desired, Math.max(itemCount, 1)));
+  }
   handleTabCompletion() {
     if (!this.autocompleteProvider) return;
     const currentLine = this.state.lines[this.state.cursorLine] || "";
@@ -53183,7 +53221,12 @@ var Editor = class {
         return;
       }
       this.autocompletePrefix = suggestions.prefix;
-      this.autocompleteList = new SelectList(suggestions.items, this.autocompleteMaxVisible, this.theme.selectList);
+      this.autocompleteListTouched = false;
+      this.autocompleteList = new SelectList(
+        suggestions.items,
+        this.computeAutocompleteMaxVisible(suggestions.items.length),
+        this.theme.selectList
+      );
       this.autocompleteState = "force";
     } else {
       this.cancelAutocomplete();
@@ -53193,6 +53236,7 @@ var Editor = class {
     this.autocompleteState = null;
     this.autocompleteList = void 0;
     this.autocompletePrefix = "";
+    this.autocompleteListTouched = false;
   }
   isShowingAutocomplete() {
     return this.autocompleteState !== null;
@@ -53210,7 +53254,11 @@ var Editor = class {
     );
     if (suggestions && suggestions.items.length > 0) {
       this.autocompletePrefix = suggestions.prefix;
-      this.autocompleteList = new SelectList(suggestions.items, this.autocompleteMaxVisible, this.theme.selectList);
+      this.autocompleteList = new SelectList(
+        suggestions.items,
+        this.computeAutocompleteMaxVisible(suggestions.items.length),
+        this.theme.selectList
+      );
     } else {
       this.cancelAutocomplete();
     }
@@ -55394,6 +55442,17 @@ var SettingsList = class {
       item.currentValue = newValue;
     }
   }
+  /**
+   * Move the selection to an item by id (respects the active filter).
+   * Used when a command targets a specific row (e.g. /settings/theme).
+   */
+  focusItemById(id) {
+    const displayItems = this.searchEnabled ? this.filteredItems : this.items;
+    const index = displayItems.findIndex((item) => item.id === id);
+    if (index >= 0) {
+      this.selectedIndex = index;
+    }
+  }
   invalidate() {
     this.submenuComponent?.invalidate?.();
   }
@@ -62341,6 +62400,9 @@ var SettingsSelectorComponent = class extends Container {
       { enableSearch: true }
     );
     this.addChild(this.settingsList);
+    if (config.focusItem) {
+      this.settingsList.focusItemById(config.focusItem);
+    }
   }
   getSettingsList() {
     return this.settingsList;
@@ -62447,36 +62509,6 @@ function selectRuntimeExtensionWinners(infos) {
   }
   return reversed.reverse();
 }
-var ExtensionStateSubmenu = class extends Container {
-  selectList;
-  constructor(identity, currentValue, scope, onSelect, onCommitted, onCancel) {
-    super();
-    this.addChild(new Text(theme.bold(theme.fg("accent", identity)), 0, 0));
-    this.addChild(new Spacer(1));
-    const settingsPath = scope === "project" ? "./.pie/settings.json" : "~/.pie/settings.json";
-    this.addChild(new Text(theme.fg("muted", `Save an override in ${settingsPath}`), 0, 0));
-    this.addChild(new Spacer(1));
-    const options = [
-      { value: "on", label: "On", description: "Enable on next start" },
-      { value: "off", label: "Off", description: "Disable on next start" }
-    ];
-    this.selectList = new SelectList(options, options.length, getSelectListTheme());
-    this.selectList.setSelectedIndex(currentValue === "off" ? 1 : 0);
-    this.selectList.onSelect = (item) => {
-      const effective = onSelect(item.value === "on");
-      if (effective !== void 0) {
-        onCommitted(effective);
-      }
-    };
-    this.selectList.onCancel = onCancel;
-    this.addChild(this.selectList);
-    this.addChild(new Spacer(1));
-    this.addChild(new Text(theme.fg("dim", "  Enter to select \xB7 Esc to go back"), 0, 0));
-  }
-  handleInput(data) {
-    this.selectList.handleInput(data);
-  }
-};
 function unidentifiedLabel(info) {
   const parentName = path23.basename(path23.dirname(info.entryPath));
   const fileName = path23.basename(info.entryPath);
@@ -62497,37 +62529,41 @@ var ExtensionEnablementSelectorComponent = class extends Container {
       0
     ));
     this.addChild(new Spacer(1));
+    const identityById = /* @__PURE__ */ new Map();
+    const lastPersistedValue = /* @__PURE__ */ new Map();
     const items = selectRuntimeExtensionWinners(infos).map((info, index) => {
       const identity = info.identity;
       const descriptionParts = [`Source: ${info.source}`];
       if (info.description) descriptionParts.push(info.description);
       if (!identity) descriptionParts.push("No stable identity; this entry is read-only.");
+      const id = identity ?? `unidentified:${index}`;
+      if (identity) {
+        identityById.set(id, identity);
+        lastPersistedValue.set(id, info.enabled ? "on" : "off");
+      }
       const item = {
-        id: `extension:${index}`,
+        id,
         label: identity ?? unidentifiedLabel(info),
         description: descriptionParts.join(" \xB7 "),
         currentValue: info.enabled ? "on" : "off"
       };
-      if (identity) {
-        item.submenu = (currentValue, done) => {
-          const submenu = new ExtensionStateSubmenu(
-            identity,
-            currentValue,
-            scope,
-            (enabled) => callbacks.onToggle(identity, enabled),
-            (effectiveEnabled) => done(effectiveEnabled ? "on" : "off"),
-            () => done()
-          );
-          return submenu;
-        };
-      }
+      if (identity) item.values = ["on", "off"];
       return item;
     });
     this.settingsList = new SettingsList(
       items,
       10,
       getSettingsListTheme(),
-      () => {
+      (id, newValue) => {
+        const identity = identityById.get(id);
+        if (!identity) return;
+        const previous = lastPersistedValue.get(id) ?? "on";
+        const accepted = callbacks.onToggle(identity, newValue === "on");
+        if (accepted === false) {
+          this.settingsList.updateValue(id, previous);
+          return;
+        }
+        lastPersistedValue.set(id, newValue);
       },
       callbacks.onCancel,
       { enableSearch: true }
@@ -62587,9 +62623,9 @@ function createExtensionSelector(host, scope, onCancel) {
   return new ExtensionEnablementSelectorComponent(infos, scope, {
     onToggle: (identity, enabled) => {
       const outcome = trySetExtensionEnabled(host, identity, enabled, scope);
-      if (!outcome) return void 0;
+      if (!outcome) return false;
       host.showStatus(outcome.message);
-      return outcome.effectiveEnabled;
+      return true;
     },
     onCancel
   });
@@ -62679,16 +62715,21 @@ var BUILTIN_SLASH_COMMANDS = [
   { name: "debugs/context", description: "Append a context summary to ~/.pie/logs/pie-cli.log" },
   { name: "debugs/package", description: "Append a package summary to ~/.pie/logs/pie-cli.log" },
   { name: "settings/quit", description: "Exit Pie" },
-  { name: "skills", description: "Open skills menu" },
-  { name: "skills/list", description: "List available skills" },
+  { name: "skills", description: "Manage skills: list, toggle enable/disable, invoke" },
+  { name: "skills/list", description: "List available skills (plain text)" },
+  { name: "skills/create", description: "Create a new skill from a template" },
   { name: "skills/enable", description: "Enable a skill by name" },
   { name: "skills/disable", description: "Disable a skill by name" },
   { name: "skills/reload", description: "Reload skills from disk" },
   { name: "skills/use", description: "Use a skill" },
   { name: "tools", description: "List tools and manage enable/disable toggles" },
+  { name: "tools/list", description: "List runtime tools and their state (plain text)" },
   { name: "tools/enable", description: "Enable a tool by name" },
   { name: "tools/disable", description: "Disable a tool by name" },
-  { name: "tools/subagent", description: "Spawn subagents in parallel to handle tasks" }
+  { name: "tools/subagent", description: "Spawn subagents in parallel to handle tasks" },
+  { name: "files/upload", description: "Attach a file to the conversation" },
+  { name: "files/upload-pic", description: "Attach an image to the conversation" },
+  { name: "files/upload-video", description: "Attach a video to the conversation" }
 ];
 
 // src/commands/interactive-debug-commands.ts
@@ -65261,6 +65302,81 @@ function errorMessage2(error) {
   return error instanceof Error ? error.message : String(error);
 }
 function handleSkillsCommand(host) {
+  host.showSelector((done) => {
+    const settingsManager = host.options.settingsManager;
+    const discovered = listDiscoveredSkills(host);
+    const items = discovered.map((skill) => ({
+      id: `skill:${skill.name}`,
+      label: skill.name,
+      description: `${skill.description} \xB7 Source: ${skill.source ?? "unknown"}`,
+      currentValue: settingsManager.isSkillEnabled(skill.name) ? "on" : "off",
+      values: ["on", "off"]
+    }));
+    const settingsList = new SettingsList(
+      items,
+      12,
+      {
+        label: (text, selected) => selected ? theme.fg("accent", text) : theme.fg("text", text),
+        value: (text, selected) => selected ? theme.fg("accent", text) : theme.fg("accent", text),
+        description: (text) => theme.fg("muted", text),
+        cursor: "> ",
+        hint: (text) => theme.fg("dim", text)
+      },
+      (id, newValue) => {
+        const name = id.slice("skill:".length);
+        const enabled = newValue === "on";
+        try {
+          settingsManager.setSkillEnabled(name, enabled);
+        } catch (error) {
+          host.showError(`Failed to update skill "${name}": ${errorMessage2(error)}`);
+          return;
+        }
+        applyReloadedSkills(host, discoverSkills(host));
+        host.showStatus(`Skill "${name}" ${enabled ? "enabled" : "disabled"} (reloaded).`);
+      },
+      () => done(),
+      { enableSearch: true }
+    );
+    const component = {
+      render: (width) => [
+        theme.bold(theme.fg("accent", "Skills")),
+        "",
+        theme.fg("muted", "Enter/Space toggles \xB7 changes apply immediately \xB7 Esc to close"),
+        theme.fg("dim", `Usage: /skills/skill:<name> <your request> (${discovered.length} discovered)`),
+        "",
+        ...settingsList.render(width)
+      ],
+      handleInput: (data) => settingsList.handleInput(data),
+      invalidate: () => settingsList.invalidate()
+    };
+    return { component, focus: settingsList };
+  });
+}
+function discoverSkills(host) {
+  const builtinDir = path25.join(getBuiltinDir(), "skills");
+  const userDir = path25.join(os7.homedir(), ".pie", "skills");
+  const projectDir = path25.join(process.cwd(), ".pie", "skills");
+  return loadSkills({ dirs: buildSkillDirs({ builtinDir, userDir, projectDir, cwd: process.cwd() }) });
+}
+function listDiscoveredSkills(host) {
+  return discoverSkills(host).skills;
+}
+function applyReloadedSkills(host, result) {
+  host.skills = result.skills.filter((skill) => host.options.settingsManager.isSkillEnabled(skill.name));
+  host.skillsSection = formatSkillsForPrompt(host.skills);
+  host.applyRuntimeToolMode(host.allTools.length > 0 ? host.allTools : host.agent.state.tools);
+  host.updateSystemPromptTools();
+  for (const skill of host.skills) {
+    const skillPath = ["skills", `skill:${skill.name}`];
+    if (!commandTree.find(skillPath)) {
+      commandTree.register(skillPath, {
+        description: skill.description,
+        handler: (_2, args) => host.handleSkillInvoke(skill.name, args || "")
+      });
+    }
+  }
+}
+function handleSkillsListCommand(host) {
   host.chatContainer.addChild(new Spacer(1));
   host.chatContainer.addChild(new Text(theme.bold("Available Skills"), 1, 0));
   if (host.skills.length === 0) {
@@ -65417,7 +65533,12 @@ async function handleSkillToggleCommand(host, args, enabled) {
   host.ui.requestRender();
 }
 async function handleSkillsCreate(host, args) {
-  console.error(`[SkillsCreate] Called with args: "${args}"`);
+  const debugLog2 = (message) => {
+    if (process.env.PIE_VERBOSE) {
+      console.error(`[SkillsCreate] ${message}`);
+    }
+  };
+  debugLog2(`Called with args: "${args}"`);
   try {
     const trimmed = args.trim();
     if (!trimmed) {
@@ -65448,7 +65569,7 @@ async function handleSkillsCreate(host, args) {
         description = descPart.replace(/^["']|["']$/g, "");
       }
     }
-    console.error(`[SkillsCreate] Parsed name: "${name}", description: "${description}"`);
+    debugLog2(`Parsed name: "${name}", description: "${description}"`);
     if (!name) {
       host.showSkillCreatePrompt();
       return;
@@ -65464,7 +65585,7 @@ async function handleSkillsCreate(host, args) {
     const skillsDir = path25.join(os7.homedir(), ".pie", "skills");
     const skillDir = path25.join(skillsDir, name);
     const skillFile = path25.join(skillDir, "SKILL.md");
-    console.error(`[SkillsCreate] Creating at: ${skillFile}`);
+    debugLog2(`Creating at: ${skillFile}`);
     if (fs23.existsSync(skillDir)) {
       host.showError(`Skill "${name}" already exists at ${skillDir}`);
       return;
@@ -65472,7 +65593,7 @@ async function handleSkillsCreate(host, args) {
     fs23.mkdirSync(skillDir, { recursive: true });
     const template = createSkillTemplate(name, description);
     fs23.writeFileSync(skillFile, template, "utf-8");
-    console.error(`[SkillsCreate] Successfully created skill`);
+    debugLog2("Successfully created skill");
     host.chatContainer.addChild(new Spacer(1));
     host.chatContainer.addChild(new Text(theme.fg("accent", `\u2713 Created skill: ${name}`), 1, 0));
     host.chatContainer.addChild(new Text(theme.fg("dim", `  Location: ${skillFile}`), 1, 0));
@@ -65481,7 +65602,7 @@ async function handleSkillsCreate(host, args) {
     host.chatContainer.addChild(new Spacer(1));
     host.ui.requestRender();
   } catch (err) {
-    console.error(`[SkillsCreate] Error: ${errorMessage2(err)}`);
+    debugLog2(`Error: ${errorMessage2(err)}`);
     host.showError(`Failed to create skill: ${errorMessage2(err)}`);
   }
 }
@@ -65556,6 +65677,67 @@ function collectKnownToolNames(host) {
   const disabled = disabledNames.filter((name) => !liveNames.includes(name));
   return { active: [...liveNames].sort(), disabled: [...disabled].sort() };
 }
+function showToolsManager(host) {
+  host.showSelector((done) => {
+    const { active, disabled } = collectKnownToolNames(host);
+    const settingsManager = host.options.settingsManager;
+    const items = [
+      ...active.map((name) => ({
+        id: `tool:${name}`,
+        label: name,
+        description: "Runtime agent tool",
+        currentValue: settingsManager.isToolEnabled(name) ? "on" : "off",
+        values: ["on", "off"]
+      })),
+      ...disabled.map((name) => ({
+        id: `tool:${name}`,
+        label: name,
+        description: "Not loaded this session (start with it enabled to use it)",
+        currentValue: "off",
+        values: ["on", "off"]
+      }))
+    ];
+    const settingsList = new SettingsList(
+      items,
+      14,
+      getSettingsListTheme(),
+      (_id, newValue) => {
+        const name = _id.slice("tool:".length);
+        const enabled = newValue === "on";
+        try {
+          settingsManager.setToolEnabled(name, enabled);
+        } catch (error) {
+          host.showError(`Failed to update tool "${name}": ${errorMessage3(error)}`);
+          return;
+        }
+        host.applyRuntimeToolMode();
+        host.showStatus(
+          enabled ? `Tool "${name}" enabled (active now).` : `Tool "${name}" disabled (removed from this session).`
+        );
+      },
+      () => done(),
+      { enableSearch: true }
+    );
+    const component = {
+      render: (width) => [
+        ...renderHeader(width),
+        ...settingsList.render(width)
+      ],
+      handleInput: (data) => settingsList.handleInput(data),
+      invalidate: () => settingsList.invalidate()
+    };
+    return { component, focus: settingsList };
+  });
+}
+function renderHeader(width) {
+  const lines = [];
+  lines.push(theme.bold(theme.fg("accent", "Tools")));
+  lines.push("");
+  lines.push(theme.fg("muted", "Enter/Space toggles \xB7 changes apply immediately \xB7 Esc to close"));
+  const hint = "Usage: /tools/enable <name> | /tools/disable <name>";
+  if (width > 20) lines.push(theme.fg("dim", hint));
+  return lines;
+}
 function handleToolsCommand(host, args) {
   const parts = args.trim().split(/\s+/).filter(Boolean);
   const subcommand = parts[0];
@@ -65565,8 +65747,8 @@ function handleToolsCommand(host, args) {
       host.showError(`Usage: /tools ${subcommand} <tool-name>`);
       return;
     }
-    const { active: active2, disabled: disabled2 } = collectKnownToolNames(host);
-    if (!active2.includes(name) && !disabled2.includes(name)) {
+    const { active, disabled } = collectKnownToolNames(host);
+    if (!active.includes(name) && !disabled.includes(name)) {
       host.showError(`Tool not found: ${name}. Use /tools to list tool names.`);
       return;
     }
@@ -65577,38 +65759,42 @@ function handleToolsCommand(host, args) {
       host.showError(`Failed to update tool "${name}": ${errorMessage3(error)}`);
       return;
     }
+    host.applyRuntimeToolMode();
     host.chatContainer.addChild(new Spacer(1));
     host.chatContainer.addChild(new Text(
-      theme.fg("accent", `Tool "${name}" ${enabled ? "enabled" : "disabled"} in ~/.pie/settings.json. Takes effect on next start.`),
+      theme.fg("accent", `Tool "${name}" ${enabled ? "enabled" : "disabled"} in ~/.pie/settings.json (applied now).`),
       1,
       0
     ));
     host.ui.requestRender();
     return;
   }
-  if (subcommand) {
-    host.showError("Usage: /tools [enable|disable <tool-name>]");
+  if (subcommand === "list") {
+    const { active, disabled } = collectKnownToolNames(host);
+    host.chatContainer.addChild(new Spacer(1));
+    host.chatContainer.addChild(new Text(theme.bold("Tools"), 1, 0));
+    if (active.length === 0 && disabled.length === 0) {
+      host.chatContainer.addChild(new Text(theme.fg("dim", "  No tools available."), 1, 0));
+    }
+    for (const name of active) {
+      const state = host.options.settingsManager.isToolEnabled(name) ? "enabled" : "disabled (removed from this session)";
+      host.chatContainer.addChild(new Text(theme.fg("dim", `  \u2022 ${name}: ${state}`), 1, 0));
+    }
+    for (const name of disabled) {
+      host.chatContainer.addChild(new Text(theme.fg("dim", `  \u2022 ${name}: disabled (/tools/enable ${name})`), 1, 0));
+    }
+    host.ui.requestRender();
     return;
   }
-  const { active, disabled } = collectKnownToolNames(host);
-  host.chatContainer.addChild(new Spacer(1));
-  host.chatContainer.addChild(new Text(theme.bold("Tools"), 1, 0));
-  if (active.length === 0 && disabled.length === 0) {
-    host.chatContainer.addChild(new Text(theme.fg("dim", "  No tools available."), 1, 0));
-  }
-  for (const name of active) {
-    host.chatContainer.addChild(new Text(theme.fg("dim", `  \u2022 ${name}: enabled`), 1, 0));
-  }
-  for (const name of disabled) {
-    host.chatContainer.addChild(new Text(theme.fg("dim", `  \u2022 ${name}: disabled (/tools/enable ${name})`), 1, 0));
+  if (subcommand) {
+    host.showError("Usage: /tools [list | enable|disable <tool-name>]");
+    return;
   }
-  host.chatContainer.addChild(new Spacer(1));
-  host.chatContainer.addChild(new Text(theme.fg("dim", "Usage: /tools/enable <name> | /tools/disable <name> (takes effect on next start)"), 1, 0));
-  host.ui.requestRender();
+  showToolsManager(host);
 }
 
 // src/commands/interactive-command-handlers.ts
-function showSettingsSelector(host) {
+function showSettingsSelector(host, focusItem) {
   host.showSelector((done) => {
     const currentModelId = host.options.model?.id || "unknown";
     const currentProvider = host.options.model?.provider || "unknown";
@@ -65624,7 +65810,8 @@ function showSettingsSelector(host) {
         yoloMode: host.yoloMode,
         calmMode: host.calmMode,
         notificationsBell: host.options.settingsManager.getBellNotificationsEnabled(),
-        notificationsDesktop: host.options.settingsManager.getDesktopNotificationsEnabled()
+        notificationsDesktop: host.options.settingsManager.getDesktopNotificationsEnabled(),
+        focusItem
       },
       {
         onThinkingLevelChange: (level) => {
@@ -66012,7 +66199,19 @@ async function handleClearCommand(host) {
   host.syncSessionModelMetadata();
   host.planModeEnabled = false;
   host.pendingPlanModeTransition = null;
-  host.footer.setState({ planMode: false });
+  const contextUsage = host.calculateContextUsage();
+  const contextWindow = host.options.model?.contextWindow ?? 0;
+  host.footer.setState({
+    planMode: false,
+    status: "ready",
+    inputTokens: contextUsage.input,
+    outputTokens: contextUsage.output,
+    cacheRead: contextUsage.cacheRead,
+    cacheWrite: contextUsage.cacheWrite,
+    cost: contextUsage.cost,
+    contextPercent: contextWindow > 0 && contextUsage.tokens !== null ? contextUsage.tokens / contextWindow * 100 : 0,
+    contextWindow
+  });
   host.updateTerminalTitle();
   host.chatContainer.clear();
   host.streamingComponent = void 0;
@@ -66193,7 +66392,7 @@ function registerBuiltinCommands(host) {
   });
   commandTree.register(["settings", "theme"], {
     description: "Change theme",
-    handler: () => host.showSettingsSelector()
+    handler: () => host.showSettingsSelector("theme")
   });
   commandTree.register(["settings", "thinking"], {
     description: "Set thinking level (off/minimal/low/medium/high/xhigh)",
@@ -66223,14 +66422,22 @@ function registerBuiltinCommands(host) {
     description: "Disable an extension by identity (writes settings)",
     handler: (_2, args) => host.handleExtensionsCommand(`disable ${args || ""}`)
   });
-  commandTree.register(["skills", "list"], {
-    description: "List available skills",
+  commandTree.register(["skills"], {
+    description: "Manage skills: list, toggle enable/disable, invoke",
     handler: () => host.handleSkillsCommand()
   });
+  commandTree.register(["skills", "list"], {
+    description: "List available skills (plain text)",
+    handler: () => host.handleSkillsListCommand()
+  });
   commandTree.register(["skills", "use"], {
     description: "Use a skill",
     handler: (_2, args) => host.handleSkillCommand(args || "")
   });
+  commandTree.register(["skills", "create"], {
+    description: "Create a new skill from a template",
+    handler: (_2, args) => host.handleSkillsCreate(args || "")
+  });
   commandTree.register(["skills", "reload"], {
     description: "Reload skills from disk",
     handler: async () => {
@@ -66259,12 +66466,16 @@ function registerBuiltinCommands(host) {
     description: "List runtime tools and manage enable/disable toggles",
     handler: (_2, args) => host.handleToolsCommand(args || "")
   });
+  commandTree.register(["tools", "list"], {
+    description: "List runtime tools and their state (plain text)",
+    handler: (_2, args) => host.handleToolsCommand(args ? `list ${args}` : "list")
+  });
   commandTree.register(["tools", "enable"], {
-    description: "Enable a tool by name (writes settings; next start)",
+    description: "Enable a tool by name (writes settings; applies now)",
     handler: (_2, args) => host.handleToolsCommand(`enable ${args || ""}`)
   });
   commandTree.register(["tools", "disable"], {
-    description: "Disable a tool by name (writes settings; next start)",
+    description: "Disable a tool by name (writes settings; applies now)",
     handler: (_2, args) => host.handleToolsCommand(`disable ${args || ""}`)
   });
   commandTree.register(["debugs", "cache-test"], {
@@ -71635,9 +71846,12 @@ var InteractiveMode = class {
     const rebuilt = this.rebuildSkillAwareTools(completeToolSet);
     const currentTools = this.extensionRunner ? wrapToolsWithExtensions(rebuilt.currentTools, this.extensionRunner) : rebuilt.currentTools;
     const originalTools = this.extensionRunner ? wrapToolsWithExtensions(rebuilt.originalTools, this.extensionRunner) : rebuilt.originalTools;
-    const activeTools = selectToolsForRuntimeMode(
-      currentTools,
-      this.planModeEnabled ? "plan" : "normal"
+    const activeTools = filterEnabledTools(
+      selectToolsForRuntimeMode(
+        currentTools,
+        this.planModeEnabled ? "plan" : "normal"
+      ),
+      this.options.settingsManager
     );
     this.agent.setTools(activeTools);
     this.allTools = [...currentTools];
@@ -71648,7 +71862,8 @@ var InteractiveMode = class {
       planMode: this.planModeEnabled ? "planning" : "off",
       filesystemScope: this.yoloMode ? "all" : "workspace",
       toolCount: activeTools.length,
-      availableToolCount: currentTools.length
+      availableToolCount: currentTools.length,
+      disabledToolCount: this.options.settingsManager.getDisabledTools().length
     });
   }
   noteRuntimeModeChanged(trigger) {
@@ -71901,8 +72116,8 @@ var InteractiveMode = class {
   async selectMentionOption(option) {
     return selectMentionOption(this.filePipelineHost, option);
   }
-  showSettingsSelector() {
-    return showSettingsSelector(this);
+  showSettingsSelector(focusItem) {
+    return showSettingsSelector(this, focusItem);
   }
   async handleModelCommand(searchTerm) {
     return handleModelCommand(this, searchTerm);
@@ -72013,6 +72228,9 @@ var InteractiveMode = class {
   handleSkillsCommand() {
     return handleSkillsCommand(this);
   }
+  handleSkillsListCommand() {
+    return handleSkillsListCommand(this);
+  }
   handleSkillCommand(name) {
     return handleSkillCommand(this, name);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cydm/pie",
-	"version": "1.0.47",
+	"version": "1.0.48",
 	"description": "Pie AI Agent CLI",
 	"type": "module",
 	"bin": {
@@ -18,7 +18,7 @@
 		"test": "npm run test:offline",
 		"pretest:offline": "npm run build --workspace @pie/agent-framework && npm run build --workspace @pie/shared-headless-capabilities && npm run build",
 		"posttest:offline": "node --test --import tsx test/remote-model-catalog.test.ts",
-		"test:offline": "node --test --import tsx test/core-services.test.ts test/cli.test.ts test/cli-auto-compaction.test.ts test/execution-state-manager.test.ts test/queued-steer-execution-state.test.ts test/architecture-boundaries.test.ts test/attachment-resolver.test.ts test/kimi-attachment-extension.test.ts test/document-attachment-extension.test.ts test/auto-compact-overflow.test.ts test/hierarchical-command-system.test.ts test/extensions-enablement.test.ts test/skill-tool-enablement.test.ts test/message-queue-unit.test.ts test/evals-harness.test.ts test/session-trace.test.ts test/runtime-mode-context.test.ts test/tool-policy.test.ts test/retry-policy.test.ts test/yolo-command.test.ts test/footer-lifecycle.test.ts test/files-utils.test.ts test/source-size-guard.test.ts test/runtime-logger.test.ts test/release-readiness.test.ts test/package-artifacts.test.ts test/code-intel-typescript-provider.test.ts test/init-extension-contract.test.ts test/skills-runtime.test.ts test/skills-agents-discovery.test.ts test/skills-symlink.test.ts test/model-overrides.test.ts test/auth-storage.test.ts test/extension-register-provider.test.ts test/extension-reload.test.ts test/extension-terminal-input.test.ts test/extension-session-before-events.test.ts test/extension-widgets.test.ts test/extension-render-hint.test.ts test/extension-oauth-restore.test.ts test/cross-host-parity.test.ts test/tool-name-rendering.test.ts test/session-selector.test.ts test/terminal-title.test.ts test/interactive-controller-title.test.ts test/todo-title.terminal.test.ts test/plan-mode-extension.test.ts test/tools-registry.test.ts test/system-prompt-contract.test.ts test/direct-bash.test.ts test/terminal-bell.test.ts test/calm-mode.test.ts test/project-root.test.ts test/guard-advisory-context.test.ts test/daily-agent-smoke.terminal.test.ts",
+		"test:offline": "node --test --import tsx test/core-services.test.ts test/cli.test.ts test/cli-auto-compaction.test.ts test/execution-state-manager.test.ts test/queued-steer-execution-state.test.ts test/architecture-boundaries.test.ts test/attachment-resolver.test.ts test/kimi-attachment-extension.test.ts test/document-attachment-extension.test.ts test/auto-compact-overflow.test.ts test/hierarchical-command-system.test.ts test/extensions-enablement.test.ts test/skill-tool-enablement.test.ts test/message-queue-unit.test.ts test/evals-harness.test.ts test/session-trace.test.ts test/runtime-mode-context.test.ts test/tool-policy.test.ts test/retry-policy.test.ts test/yolo-command.test.ts test/footer-lifecycle.test.ts test/files-utils.test.ts test/source-size-guard.test.ts test/runtime-logger.test.ts test/release-readiness.test.ts test/package-artifacts.test.ts test/code-intel-typescript-provider.test.ts test/init-extension-contract.test.ts test/skills-runtime.test.ts test/skills-agents-discovery.test.ts test/skills-symlink.test.ts test/model-overrides.test.ts test/auth-storage.test.ts test/extension-register-provider.test.ts test/extension-reload.test.ts test/extension-terminal-input.test.ts test/extension-session-before-events.test.ts test/extension-widgets.test.ts test/extension-render-hint.test.ts test/extension-oauth-restore.test.ts test/cross-host-parity.test.ts test/tool-name-rendering.test.ts test/session-selector.test.ts test/terminal-title.test.ts test/interactive-controller-title.test.ts test/todo-title.terminal.test.ts test/plan-mode-extension.test.ts test/tools-registry.test.ts test/system-prompt-contract.test.ts test/direct-bash.test.ts test/terminal-bell.test.ts test/calm-mode.test.ts test/project-root.test.ts test/guard-advisory-context.test.ts test/clear-command-usage.test.ts test/daily-agent-smoke.terminal.test.ts test/slash-menu-toggles.terminal.test.ts",
 		"test:all": "npm run test:offline && npm run test:terminal:vitest",
 		"test:terminal:vitest": "vitest run test/mention-file-select.terminal.test.ts test/tool-partial-display.terminal.test.ts test/viewport-position-final.test.ts test/resume-header.terminal.test.ts --no-file-parallelism",
 		"test:todo-tui": "PIE_REAL_TODO_TUI=1 node --test --import tsx test/todo-closure.terminal.test.ts",