@bahulam/code 0.1.1 → 0.1.2

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for describing the origin of the Work and
+      reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may accept and charge a
+      fee for acceptance of support, warranty, indemnity, or other liability
+      obligations and/or rights consistent with this License. However, in
+      accepting such obligations, You may act only on Your own behalf and on
+      Your sole responsibility, not on behalf of any other Contributor, and
+      only if You agree to indemnify, defend, and hold each Contributor
+      harmless for any liability incurred by, or claims asserted against,
+      such Contributor by reason of your accepting any such warranty or
+      additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2026 axplusb.tech
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/NOTICE

@@ -0,0 +1,39 @@
+Bahulam Code
+Copyright 2026 axplusb.tech
+
+This product includes software developed by axplusb.tech
+(https://axplusb.tech).
+
+------------------------------------------------------------------------
+Upstream and third-party attribution
+------------------------------------------------------------------------
+
+The CLI runtime derives, in part, from the open-source open-claude-code
+project. Original work bears its own copyright and license terms; those
+files remain governed by their upstream licenses, and any modifications
+to them by axplusb.tech are additionally licensed under Apache License,
+Version 2.0 as declared in the LICENSE file at the root of this project.
+
+The Bahulam runtime bundle (@bahulam/runtime-<platform>-<arch>) ships
+with a PyArmor-obfuscated Python payload that is proprietary to
+axplusb.tech and is NOT covered by the Apache License. It is distributed
+under a separate end-user license embedded in the runtime as a signed
+license JWT. Use of the runtime requires accepting that license.
+
+Third-party npm dependencies listed in package.json are the property of
+their respective owners and are used under the terms of the licenses
+they publish. See the individual package license files under
+node_modules/*/LICENSE for the specific terms of each dependency.
+
+------------------------------------------------------------------------
+Trademarks
+------------------------------------------------------------------------
+
+"Bahulam", the Bahulam wordmark, the ∞ mark, and "Orca" are trademarks
+of axplusb.tech. The Apache License, Section 6, does not grant permission
+to use these names, marks, or logos, except as required to describe the
+origin of the software or to reproduce the content of this NOTICE file.
+
+Forks and derivative works must select a distinct name and mark; the
+Bahulam and Orca marks may not be used to name, brand, or promote any
+derivative or competing distribution without prior written permission.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bahulam/code",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Bahulam Code \u2014 abundance, in your terminal. CLI-first, reliability-first, sub-agents, 65.6% SWE-bench Verified.",
   "type": "module",
   "bin": {
@@ -10,7 +10,9 @@
   "files": [
     "src/",
     "pulse/",
-    "README.md"
+    "README.md",
+    "LICENSE",
+    "NOTICE"
   ],
   "scripts": {
     "start": "node src/terminal/main.mjs",
@@ -36,7 +38,7 @@
     "gemini",
     "axplusb"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "author": "axplusb.tech <hello@axplusb.tech>",
   "homepage": "https://bahulam.ai/code",
   "repository": {
@@ -49,8 +51,8 @@
     "web-tree-sitter": "^0.26.9"
   },
   "optionalDependencies": {
-    "@bahulam/runtime-darwin-arm64": "0.1.1",
-    "@bahulam/runtime-linux-x64": "0.1.1",
-    "@bahulam/runtime-win32-x64": "0.1.1"
+    "@bahulam/runtime-darwin-arm64": "0.1.2",
+    "@bahulam/runtime-linux-x64": "0.1.2",
+    "@bahulam/runtime-win32-x64": "0.1.2"
   }
 }

package/src/config/env.mjs

@@ -35,7 +35,7 @@ export const ENV_SCHEMA = {
 
     // Permission and Security
     CLAUDE_CODE_PERMISSION_MODE: { type: 'string', default: 'default', description: 'Permission mode' },
-    CLAUDE_CODE_SANDBOX: { type: 'boolean', default: true, description: 'Enable sandbox' },
+    BAHULAM_SANDBOX: { type: 'boolean', default: true, description: 'Wrap contained/high-risk shell commands in the OS sandbox (bwrap/seatbelt)' },
 
     // Context and Memory
     CLAUDE_CODE_MAX_CONTEXT_TOKENS: { type: 'number', default: 180000, description: 'Max context window tokens' },
@@ -81,7 +81,7 @@ export const ENV_SCHEMA = {
     ANTHROPIC_AUTH_TOKEN: { type: 'string', description: 'Anthropic auth token (OAuth)' },
 
     // Extended: Sandbox & Security
-    CLAUDE_CODE_SANDBOX_PLATFORM: { type: 'string', description: 'Override sandbox platform (linux/darwin)' },
+    BAHULAM_SANDBOX_PLATFORM: { type: 'string', description: 'Override sandbox platform (linux/darwin)' },
     CLAUDE_CODE_INJECTION_CHECK: { type: 'boolean', default: true, description: 'Enable command injection checks' },
     CLAUDE_CODE_PATH_CHECK: { type: 'boolean', default: true, description: 'Enable file path validation' },
 

package/src/core/tool-executor.mjs

@@ -993,12 +993,20 @@ export function createToolExecutor({
                     const output = typeof result === 'string' ? result : String(result);
                     const content = output.replace(/^\s*\d+[→\t]/gm, '');
                     const actNudge = solutionNudge(filePath);
+                    // Set _total_lines so the tool-card display doesn't have
+                    // to compute line counts from the display-side `output`
+                    // (which contains nudges + line-number prefixes that
+                    // throw off the count and can render as "0 lines" when
+                    // downstream fallbacks miss the payload). Uses the
+                    // same split-by-newline convention as the >50-line
+                    // truncation branch above so both paths agree.
                     return {
                         success: !isError(output),
                         content,
                         output: output + nudge + actNudge,
                         _tool: 'read_file',
                         _output_type: 'file_content',
+                        _total_lines: content ? content.split('\n').length : 0,
                     };
                 },
             );

package/src/skills/installer.mjs

@@ -119,12 +119,20 @@ export class SkillInstaller {
             fs.mkdirSync(skillsDir, { recursive: true });
 
             const plans = [];
+            const seenNames = new Set();
             for (const skillDir of skillDirs) {
                 rejectSymlinks(skillDir);
                 const content = fs.readFileSync(path.join(skillDir, 'SKILL.md'), 'utf-8');
                 const name = parseSkill(content, path.basename(skillDir)).name;
                 if (onlyNames && !onlyNames.includes(name)) continue;
                 if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(name)) throw new Error(`Unsafe skill name: ${name}`);
+                // Source repos sometimes ship multiple SKILL.md bundles that all
+                // parse to the same name (e.g. one variant per agent tool).
+                // Silently keep only the FIRST occurrence — otherwise we'd copy
+                // N bundles into the same destination and the last write would
+                // win invisibly.
+                if (seenNames.has(name)) continue;
+                seenNames.add(name);
                 const destination = path.join(skillsDir, name);
                 if (fs.existsSync(destination)) {
                     if (!force) throw new Error(`Skill already installed: ${name} (use --force to replace)`);

package/src/terminal/ansi.mjs

@@ -600,21 +600,80 @@ function inlineMarkdown(text) {
 /**
  * Render a unified diff with +/- color highlighting.
  */
-export function renderDiff(diffText) {
+// Parses `@@ -old_start,old_count +new_start,new_count @@` from a unified
+// diff hunk header. Missing counts default to 1 (per unified-diff spec).
+const _HUNK_RE = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/;
+
+function _padLineNo(n, width) {
+  return n === null ? ' '.repeat(width) : String(n).padStart(width);
+}
+
+/**
+ * Render a unified diff with GitHub-PR-style single-column line numbers.
+ *
+ *   12   context line
+ *   13 - removed line
+ *   13 + added line
+ *   14   context line
+ *
+ * Deletions show the OLD-side line number; additions and context show the
+ * NEW-side number. Hunk headers (`@@ ... @@`) are kept as visual section
+ * markers and seed the counters. Pass `{ numbers: false }` to fall back to
+ * the plain colored-only form.
+ */
+export function renderDiff(diffText, { numbers = true } = {}) {
   if (!diffText) return '';
   const lines = diffText.split('\n');
   const out = [];
+  let oldLn = null;
+  let newLn = null;
+  // Width the gutter to the largest number that will appear in this diff,
+  // clamped to 4 so short diffs still line up cleanly. Prevents a single
+  // huge line number from pushing the whole gutter wide.
+  let gutterWidth = 4;
+  if (numbers) {
+    for (const line of lines) {
+      const m = line.match(_HUNK_RE);
+      if (m) {
+        const maxNum = Math.max(parseInt(m[1], 10), parseInt(m[2], 10));
+        gutterWidth = Math.max(gutterWidth, String(maxNum + 200).length);
+      }
+    }
+  }
+
   for (const line of lines) {
     if (line.startsWith('+++') || line.startsWith('---')) {
       out.push(c.bold(line));
-    } else if (line.startsWith('@@')) {
+      continue;
+    }
+    const m = line.match(_HUNK_RE);
+    if (m) {
+      oldLn = parseInt(m[1], 10);
+      newLn = parseInt(m[2], 10);
       out.push(c.brand(line));
-    } else if (line.startsWith('+')) {
-      out.push(c.green(line));
+      continue;
+    }
+    if (!numbers || oldLn === null) {
+      if (line.startsWith('+')) out.push(c.green(line));
+      else if (line.startsWith('-')) out.push(c.red(line));
+      else out.push(c.gray(line));
+      continue;
+    }
+    if (line.startsWith('+')) {
+      out.push(`${c.gray(_padLineNo(newLn, gutterWidth))} ${c.green(line)}`);
+      newLn += 1;
     } else if (line.startsWith('-')) {
-      out.push(c.red(line));
+      out.push(`${c.gray(_padLineNo(oldLn, gutterWidth))} ${c.red(line)}`);
+      oldLn += 1;
+    } else if (line.startsWith('\\')) {
+      // "" — meta, no line-number applies.
+      out.push(`${' '.repeat(gutterWidth)} ${c.dim(line)}`);
     } else {
-      out.push(c.gray(line));
+      // Context (line starts with a single space per unified-diff spec,
+      // or is truly empty for a blank context line).
+      out.push(`${c.gray(_padLineNo(newLn, gutterWidth))} ${c.gray(line)}`);
+      oldLn += 1;
+      newLn += 1;
     }
   }
   return out.join('\n');

package/src/terminal/repl.mjs

@@ -49,6 +49,9 @@ import { resolveBackendUrl } from '../core/backend-url.mjs';
 import { formatMessageWindow, lowWindowStatus, messagesRemaining } from '../core/rate-limit-display.mjs';
 import { formatAgentErrorGuidance } from '../core/error-guidance.mjs';
 import { BUILTIN_AGENTS, findBuiltinAgent, localAgentMatches, runAgent, runAgentDefinition } from './agents.mjs';
+import { SkillInstaller } from '../skills/installer.mjs';
+import { SkillsLoader } from '../skills/loader.mjs';
+import { openSkillsPicker, formatSkillsList } from './skills-picker.mjs';
 import { createAgentFile, isVsCodeTerminal, listLocalAgents, openAgentFile, syncAgentsToBackend } from '../agents/scaffold.mjs';
 import { SessionManager } from '../core/session-manager.mjs';
 import { parseArgs } from '../config/cli-args.mjs';
@@ -939,6 +942,163 @@ async function handleAgentsCommand(rest = '', ctx) {
   printAgentsUsage();
 }
 
+function printSkillsUsage() {
+  process.stderr.write(`  ${c.dim('Usage:')}\n`);
+  process.stderr.write(`  ${c.dim('  /skills                       open interactive picker')}\n`);
+  process.stderr.write(`  ${c.dim('  /skills list [--project]      list installed skills')}\n`);
+  process.stderr.write(`  ${c.dim('  /skills install <url|path> [--project] [--force]')}\n`);
+  process.stderr.write(`  ${c.dim('  /skills view <name> [resource]')}\n`);
+  process.stderr.write(`  ${c.dim('  /skills remove <name> [--project]')}\n`);
+  process.stderr.write(`  ${c.dim('  /skills update <name> [--project]')}\n`);
+}
+
+async function handleSkillsCommand(rest = '', ctx) {
+  const parts = String(rest || '').trim().split(/\s+/).filter(Boolean);
+  const hasFlag = (flag) => parts.includes(flag);
+  const positional = parts.filter(p => !p.startsWith('--'));
+  const action = (positional[0] || 'picker').toLowerCase();
+  const scope = hasFlag('--project') ? 'project' : 'global';
+  const cwd = safeCwd();
+  const installer = new SkillInstaller({ cwd });
+  const loader = new SkillsLoader().load(cwd);
+
+  if (action === 'picker' || action === '') {
+    const skills = loader.list({ scope: hasFlag('--all') ? '' : '' });
+    if (!skills.length) {
+      process.stderr.write(`  ${c.dim('No skills installed yet.')}\n`);
+      process.stderr.write(`  ${c.dim('Install one:')} ${c.brand('/skills install https://github.com/<user>/<repo>')}\n`);
+      return;
+    }
+    const rl = ctx?.rl || null;
+    const choice = await openSkillsPicker({ rl, skills });
+    if (!choice) {
+      process.stderr.write(formatSkillsList(skills));
+      return;
+    }
+    if (choice.action === 'view') {
+      try {
+        const view = loader.view(choice.name, null);
+        process.stderr.write(`\n  ${c.bold(view.name)} ${c.dim(`· ${view.source || ''}`)}\n`);
+        if (view.description) process.stderr.write(`  ${c.dim(view.description)}\n`);
+        process.stderr.write(`  ${c.gray('─'.repeat(60))}\n`);
+        process.stderr.write(renderMarkdown(String(view.instructions || '')) + '\n');
+        if (view.resources?.length) {
+          process.stderr.write(`  ${c.dim('Bundled resources:')}\n`);
+          for (const r of view.resources.slice(0, 20)) process.stderr.write(`    ${c.dim('·')} ${r}\n`);
+          if (view.resources.length > 20) process.stderr.write(`    ${c.dim(`(+${view.resources.length - 20} more)`)}\n`);
+          process.stderr.write(`  ${c.dim('View one:')} /skills view ${view.name} <path>\n`);
+        }
+      } catch (err) {
+        process.stderr.write(`  ${c.red(err.message || String(err))}\n`);
+      }
+      return;
+    }
+    if (choice.action === 'remove') {
+      try {
+        installer.remove(choice.name, { scope: 'global' });
+        process.stderr.write(`  ${c.green('✓')} ${c.dim('Removed skill:')} ${choice.name}\n`);
+      } catch (err) {
+        // Try project scope if global failed.
+        try {
+          installer.remove(choice.name, { scope: 'project' });
+          process.stderr.write(`  ${c.green('✓')} ${c.dim('Removed skill:')} ${choice.name} ${c.dim('(project)')}\n`);
+        } catch (err2) {
+          process.stderr.write(`  ${c.red(err2.message || String(err2))}\n`);
+        }
+      }
+      return;
+    }
+    return;
+  }
+
+  if (action === 'list' || action === 'ls') {
+    const filter = hasFlag('--all') ? '' : scope;
+    const skills = loader.list({ scope: filter });
+    process.stderr.write(formatSkillsList(skills));
+    return;
+  }
+
+  if (action === 'install') {
+    const source = positional[1];
+    if (!source) {
+      process.stderr.write(`  ${c.yellow('Usage:')} /skills install <git-url|path> [--project] [--force]\n`);
+      return;
+    }
+    try {
+      process.stderr.write(`  ${c.dim('Installing')} ${source} ${c.dim(`→ ${scope}`)}...\n`);
+      const result = installer.install(source, { scope, force: hasFlag('--force') });
+      const unique = [...new Set(result.installed || [])];
+      const dupes = (result.installed?.length || 0) - unique.length;
+      process.stderr.write(`  ${c.green('✓')} ${c.dim('Installed:')} ${unique.join(', ') || '(none)'}\n`);
+      if (dupes > 0) {
+        process.stderr.write(`  ${c.yellow('!')} ${c.dim(`Source shipped ${dupes} duplicate SKILL.md file(s) with the same name — last one won.`)}\n`);
+      }
+      process.stderr.write(`  ${c.dim('Lock file:')} ${result.lock_file}\n`);
+    } catch (err) {
+      process.stderr.write(`  ${c.red(err.message || String(err))}\n`);
+    }
+    return;
+  }
+
+  if (action === 'view') {
+    const name = positional[1];
+    if (!name) {
+      process.stderr.write(`  ${c.yellow('Usage:')} /skills view <name> [resource-path]\n`);
+      return;
+    }
+    const resource = positional[2] || null;
+    try {
+      const view = loader.view(name, resource);
+      process.stderr.write(`\n  ${c.bold(view.name)}${resource ? c.dim(` · ${resource}`) : ''}\n`);
+      if (!resource && view.description) process.stderr.write(`  ${c.dim(view.description)}\n`);
+      process.stderr.write(`  ${c.gray('─'.repeat(60))}\n`);
+      const body = resource ? view.content : view.instructions;
+      process.stderr.write(renderMarkdown(String(body || '')) + '\n');
+      if (!resource && view.resources?.length) {
+        process.stderr.write(`  ${c.dim('Bundled resources:')}\n`);
+        for (const r of view.resources.slice(0, 20)) process.stderr.write(`    ${c.dim('·')} ${r}\n`);
+        if (view.resources.length > 20) process.stderr.write(`    ${c.dim(`(+${view.resources.length - 20} more)`)}\n`);
+      }
+    } catch (err) {
+      process.stderr.write(`  ${c.red(err.message || String(err))}\n`);
+    }
+    return;
+  }
+
+  if (action === 'remove' || action === 'rm' || action === 'uninstall') {
+    const name = positional[1];
+    if (!name) {
+      process.stderr.write(`  ${c.yellow('Usage:')} /skills remove <name> [--project]\n`);
+      return;
+    }
+    try {
+      installer.remove(name, { scope });
+      process.stderr.write(`  ${c.green('✓')} ${c.dim('Removed:')} ${name} ${c.dim(`(${scope})`)}\n`);
+    } catch (err) {
+      process.stderr.write(`  ${c.red(err.message || String(err))}\n`);
+    }
+    return;
+  }
+
+  if (action === 'update' || action === 'upgrade') {
+    const name = positional[1];
+    if (!name) {
+      process.stderr.write(`  ${c.yellow('Usage:')} /skills update <name> [--project]\n`);
+      return;
+    }
+    try {
+      const result = installer.update(name, { scope });
+      process.stderr.write(`  ${c.green('✓')} ${c.dim('Updated:')} ${name} ${c.dim(`(${scope})`)}\n`);
+      if (result?.commit) process.stderr.write(`  ${c.dim('Commit:')} ${result.commit.slice(0, 12)}\n`);
+    } catch (err) {
+      process.stderr.write(`  ${c.red(err.message || String(err))}\n`);
+    }
+    return;
+  }
+
+  printSkillsUsage();
+}
+
 function commandCompletions(line) {
   if (line.startsWith('/help ')) {
     const topic = line.slice('/help '.length).toLowerCase();
@@ -1241,6 +1401,16 @@ function foldedSubAgentName(data = {}) {
   return data?.sub_agent || data?.agent || data?.type || 'sub-agent';
 }
 
+function subAgentStartingLine(agentType = 'sub-agent') {
+  const normalized = String(agentType || 'sub-agent').toLowerCase();
+  if (normalized === 'plan') return '→ preparing plan handoff';
+  if (normalized === 'explore') return '→ starting exploration';
+  if (normalized === 'verify') return '→ preparing verification';
+  if (normalized === 'debug') return '→ isolating failure context';
+  if (normalized === 'refactor') return '→ preparing refactor pass';
+  return `→ starting ${normalized}`;
+}
+
 function ensureFoldedSubAgentTools(agentType) {
   const current = runtime.foldedSubAgentTools;
   if (current && current.agentType === agentType) return current;
@@ -1533,11 +1703,19 @@ function renderEvent(event) {
       const phaseTag = phase === 'mid_turn' ? 'mid-turn' : 'pre-turn';
       const collapsed = Number(data?.collapsed_messages || 0);
       const kept = Number(data?.kept_recent || 0);
-      const before = Number(data?.before_est_tokens || 0);
-      const beforeK = before ? ` · ~${Math.round(before / 1000)}k est tokens` : '';
+      // PRD-213: backend now sends `before_tokens` (real when source is
+      // `ground_truth`, chars/4 estimate when `estimator_fallback`) plus
+      // the resolved threshold. Keep the legacy `before_est_tokens` fall-
+      // back so an older backend that hasn't rolled out yet still renders.
+      const before = Number(data?.before_tokens || data?.before_est_tokens || 0);
+      const threshold = Number(data?.threshold || 160_000);
+      const source = String(data?.source || 'estimator');
+      const tokenLabel = source === 'ground_truth' ? 'real' : 'est';
+      const beforeK = before ? ` · ${Math.round(before / 1000)}k/${Math.round(threshold / 1000)}k ${tokenLabel} tokens` : '';
+      const sourceTag = source === 'ground_truth' ? '' : ` [${source}]`;
       const keptPart = kept ? ` · kept last ${kept}` : '';
       const preview = String(data?.summary_preview || '').trim();
-      process.stderr.write(`  ${c.brand('✎')} ${c.dim(`context summarized (${phaseTag}) · ${collapsed} older message${collapsed === 1 ? '' : 's'} collapsed${keptPart}${beforeK}`)}\n`);
+      process.stderr.write(`  ${c.brand('✎')} ${c.dim(`context summarized (${phaseTag}) · ${collapsed} older message${collapsed === 1 ? '' : 's'} collapsed${keptPart}${beforeK}${sourceTag}`)}\n`);
       if (preview) {
         process.stderr.write(`    ${c.dim('› ' + preview)}\n`);
       }
@@ -1780,6 +1958,7 @@ function renderEvent(event) {
       // Phase per sub-agent run: the status line counts elapsed time and
       // tool calls live ("plan agent · 4 calls · 32s") for the whole run.
       startSpinner(`${agentType} agent`, { phase: `sub:${agentType}:${Date.now()}` });
+      pushSubAgentWindowLine(subAgentStartingLine(agentType));
       break;
     }
 
@@ -3240,9 +3419,14 @@ async function handleCommand(input, ctx) {
     }
 
     case '/agents':
+    case '/subagents':
       await handleAgentsCommand(rest, ctx);
       return;
 
+    case '/skills':
+      await handleSkillsCommand(rest, ctx);
+      return;
+
     case '/explore':
     case '/review':
     case '/architect': {
@@ -3398,7 +3582,7 @@ export async function startTerminalRepl() {
     stopSpinner();
     flushContent();
     flushPendingHead();
-    flushCompactReadRun();
+    flushExploreRun();
     runtime.foldedSubAgentTools = null;
     clearCards();
 

package/src/terminal/skills-picker.mjs

@@ -0,0 +1,121 @@
+/**
+ * Interactive skills picker — reuses the raw-stdin overlay pattern from
+ * repl-ask-form.mjs. Arrow keys move, Enter views the selected SKILL.md,
+ * Esc/q closes. Emits nothing when the terminal is not a TTY (falls
+ * back to plain-text listing at the call site).
+ */
+
+import { c, renderMarkdown, stripAnsi } from './ansi.mjs';
+import { fitAnsiLine, writeOverlayFrame, eraseOverlayFrame } from './repl-format.mjs';
+
+function truncate(str, max) {
+  const s = String(str || '');
+  if (s.length <= max) return s;
+  return s.slice(0, Math.max(1, max - 1)) + '…';
+}
+
+/**
+ * @param {object} opts
+ * @param {object|null} opts.rl              readline instance to pause/resume
+ * @param {Array<{name,description,scope,source}>} opts.skills
+ * @returns {Promise<{action:'view',name:string}|{action:'remove',name:string}|null>}
+ */
+export async function openSkillsPicker({ rl, skills }) {
+  if (!process.stdin.isTTY) return null;
+  if (!skills?.length) return null;
+  if (rl) rl.pause();
+
+  const rows = skills.map(s => ({
+    name: s.name,
+    description: s.description || '',
+    scope: s.scope,
+    source: s.source,
+  }));
+
+  return await new Promise((resolve) => {
+    const wasRaw = process.stdin.isRaw;
+    let cursor = 0;
+    let renderedLines = 0;
+
+    const render = () => {
+      const cols = Math.max(60, process.stderr.columns || 120);
+      const nameWidth = Math.min(24, Math.max(...rows.map(r => r.name.length)));
+      const scopeWidth = 8;
+      const lines = [];
+      lines.push(`  ${c.bold('Installed skills')} ${c.dim(`· ${rows.length} bundle${rows.length === 1 ? '' : 's'}`)}`);
+      lines.push('');
+      rows.forEach((row, i) => {
+        const active = i === cursor;
+        const marker = active ? c.brand('▸') : ' ';
+        const name = row.name.padEnd(nameWidth).slice(0, nameWidth);
+        const scope = row.scope.padEnd(scopeWidth).slice(0, scopeWidth);
+        const descBudget = Math.max(20, cols - 6 - nameWidth - scopeWidth - 4);
+        const desc = truncate(row.description, descBudget);
+        const painted = active
+          ? `${c.brand(name)}  ${c.dim(scope)}  ${c.brand(desc)}`
+          : `${c.bold(name)}  ${c.dim(scope)}  ${desc}`;
+        lines.push(fitAnsiLine(`  ${marker} ${painted}`, cols - 1));
+      });
+      lines.push('');
+      lines.push(fitAnsiLine(
+        `  ${c.dim('↑↓ move · Enter view SKILL.md · r remove · Esc close')}`,
+        cols - 1,
+      ));
+      writeOverlayFrame(renderedLines, lines);
+      renderedLines = lines.length;
+    };
+
+    const cleanup = (value) => {
+      process.stdin.removeListener('data', onData);
+      process.stdin.setRawMode(wasRaw || false);
+      eraseOverlayFrame(renderedLines);
+      if (rl) rl.resume();
+      resolve(value);
+    };
+
+    const onData = (data) => {
+      const key = data.toString('utf8');
+      if (key === '\x1b' || key === '\x03' || key === 'q') { cleanup(null); return; }
+      if (key === '\r' || key === '\n') {
+        cleanup({ action: 'view', name: rows[cursor].name });
+        return;
+      }
+      if (key === 'r' || key === 'R') {
+        cleanup({ action: 'remove', name: rows[cursor].name });
+        return;
+      }
+      if (key === '\x1b[A' || key === 'k') { cursor = Math.max(0, cursor - 1); render(); return; }
+      if (key === '\x1b[B' || key === 'j') { cursor = Math.min(rows.length - 1, cursor + 1); render(); return; }
+      if (key === '\x1b[H' || key === 'g') { cursor = 0; render(); return; }
+      if (key === '\x1b[F' || key === 'G') { cursor = rows.length - 1; render(); return; }
+    };
+
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.on('data', onData);
+    render();
+  });
+}
+
+/**
+ * Render a nicely-aligned static list (fallback when no TTY, or for `/skills list`).
+ * Returns the printable string; caller writes it to stderr.
+ */
+export function formatSkillsList(skills) {
+  if (!skills?.length) return `  ${c.dim('No skills installed. Try /skills install <git-url>')}\n`;
+  const nameWidth = Math.min(28, Math.max(...skills.map(s => s.name.length)));
+  const scopeWidth = 8;
+  const cols = Math.max(60, process.stderr.columns || 120);
+  const descBudget = Math.max(20, cols - 6 - nameWidth - scopeWidth - 4);
+  const lines = [`  ${c.bold('Installed skills')} ${c.dim(`· ${skills.length} bundle${skills.length === 1 ? '' : 's'}`)}\n`];
+  for (const s of skills) {
+    const name = s.name.padEnd(nameWidth).slice(0, nameWidth);
+    const scope = String(s.scope || '').padEnd(scopeWidth).slice(0, scopeWidth);
+    const desc = truncate(s.description || '', descBudget);
+    lines.push(`    ${c.bold(name)}  ${c.dim(scope)}  ${desc}\n`);
+  }
+  lines.push(`\n  ${c.dim('Open interactively:')} /skills\n`);
+  return lines.join('');
+}
+
+export { renderMarkdown, stripAnsi };

package/src/terminal/skills.mjs

@@ -1,5 +1,6 @@
 import { SkillInstaller } from '../skills/installer.mjs';
 import { SkillsLoader } from '../skills/loader.mjs';
+import { formatSkillsList } from './skills-picker.mjs';
 
 function has(args, flag) {
     return args.includes(flag);
@@ -22,9 +23,8 @@ export async function runSkillsCommand(args, { cwd = process.cwd() } = {}) {
 
     if (action === 'list') {
         const rows = loader.list({ scope: has(rest, '--all') ? '' : scope });
-        if (has(rest, '--json')) print(rows);
-        else if (!rows.length) print('No skills found.');
-        else for (const row of rows) print(`${row.name}\t${row.scope}\t${row.source}\t${row.description}`);
+        if (has(rest, '--json')) { print(rows); return; }
+        process.stdout.write(formatSkillsList(rows));
         return;
     }
     if (action === 'view') {

package/src/ui/banner.mjs

@@ -51,7 +51,7 @@ export function renderBanner(version = '') {
   const lines = [''];
 
   for (let i = 0; i < wordmark.length; i++) {
-    lines.push(`  ${paint.brand.accent(mark[i].padEnd(markWidth))}  ${paint.bold(paint.brand.primary(wordmark[i]))}`);
+    lines.push(`  ${paint.text.muted(mark[i].padEnd(markWidth))}  ${paint.bold(paint.brand.primary(wordmark[i]))}`);
   }
 
   lines.push(`${wordmarkIndent}${code} ${dim('· abundance in your terminal')}${vTag}`);

package/src/ui/slash-commands.mjs

@@ -45,6 +45,8 @@ export const COMMANDS = {
   '/surgical':    'Verbosity: show everything (reasoning, expanded tools)',
   '/compact':     'Compact conversation context',
   '/agents':      'List available agents',
+  '/subagents':   'Alias of /agents (list/create/edit/sync sub-agents)',
+  '/skills':      'List / install / view / remove skills (SKILL.md bundles)',
   '/run':         'Run a sub-agent or synced workflow',
   '/explore':     'Code explorer agent',
   '/review':      'Code review agent',
@@ -146,6 +148,20 @@ export const HELP_GROUPS = [
       ['/architect <instruction>', 'Design an approach'],
     ],
   },
+  {
+    key: 'skills',
+    title: 'Skills',
+    summary: 'SKILL.md bundles',
+    commands: [
+      ['/skills', 'List installed skills'],
+      ['/skills install <url|path>', 'Install from Git URL or local directory'],
+      ['/skills install <src> --project', 'Install into .bahulam/skills (project scope)'],
+      ['/skills install <src> --force', 'Overwrite an existing skill'],
+      ['/skills view <name> [resource]', 'Show SKILL.md or a bundled resource'],
+      ['/skills remove <name>', 'Uninstall a skill'],
+      ['/skills update <name>', 'Reinstall from the recorded source'],
+    ],
+  },
   {
     key: 'workflows',
     title: 'Workflows',

package/src/ui/transcript-block.mjs

@@ -1,7 +1,10 @@
 import { paint } from './palette.mjs';
 
 function tonePaint(tone) {
-  return tone === 'user' ? paint.brand.accent : paint.brand.primary;
+  // 'user' tone was brand.accent (pink) — swapped to state.success (green)
+  // so the "your input" prompt reads as an active/go signal instead of the
+  // magenta 'attention/warn' tint the accent palette carries elsewhere.
+  return tone === 'user' ? paint.state.success : paint.brand.primary;
 }
 
 export function transcriptHeader(label, { tone = 'assistant' } = {}) {