shmakk 1.2.1 → 1.2.3

package/src/hooks/bash.js

@@ -3,6 +3,21 @@ const os = require('os');
 const path = require('path');
 
 const INIT = `
+# Source login scripts first (equivalent to bash -l).
+# When --rcfile is used, bash skips the normal login sequence, so we must
+# replicate it manually. Order matters: profile.d → /etc/profile, then
+# first found of: ~/.bash_profile, ~/.bash_login, ~/.profile, ~/.bashrc.
+[ -d /etc/profile.d ] && for f in /etc/profile.d/*.sh; do [ -r "$f" ] && . "$f"; done
+[ -f /etc/profile ] && . /etc/profile
+if [ -f "$HOME/.bash_profile" ]; then
+    . "$HOME/.bash_profile"
+elif [ -f "$HOME/.bash_login" ]; then
+    . "$HOME/.bash_login"
+elif [ -f "$HOME/.profile" ]; then
+    . "$HOME/.profile"
+fi
+# Then interactive rc files (these may be already sourced above, but
+# sourcing twice is harmless for well-behaved scripts).
 [ -f /etc/bash.bashrc ] && . /etc/bash.bashrc
 [ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc"
 
@@ -13,13 +28,13 @@ __shmakk_preexec() {
     [ "$BASH_COMMAND" = "$PROMPT_COMMAND" ] && return
     __shmakk_armed=
     local cmd
-    cmd=$(printf '%s' "$BASH_COMMAND" | base64 -w0 2>/dev/null || printf '%s' "$BASH_COMMAND" | base64)
+    cmd=$(printf '%s' "$BASH_COMMAND" | base64 -w0 2>/dev/null || base64 -b 0 2>/dev/null || base64 | tr -d '\n')
     printf '\\e]6973;B;%s\\a' "$cmd"
 }
 __shmakk_precmd() {
     local ec=$?
     local p
-    p=$(printf '%s' "$PWD" | base64 -w0 2>/dev/null || printf '%s' "$PWD" | base64)
+    p=$(printf '%s' "$PWD" | base64 -w0 2>/dev/null || base64 -b 0 2>/dev/null || base64 | tr -d '\n')
     printf '\\e]6973;C;%s\\a' "$ec"
     printf '\\e]6973;D;%s\\a' "$p"
     __shmakk_armed=1

package/src/hooks/fish.js

@@ -1,17 +1,36 @@
 // Returns { args, env, cleanup } for spawning fish with markers wired up.
 // fish supports `-C COMMAND` to run init code after config.fish.
+//
+// base64 encoding: try `-w0` (GNU coreutils), fall back to `-b 0` (BSD/macOS),
+// then plain `base64` as last resort. `tr -d '\n'` strips any line wrapping
+// so the OSC marker payload stays on one line.
 
 const INIT = `
 function __shmakk_pre --on-event fish_preexec
-    set -l c (printf '%s' "$argv" | base64 -w0 2>/dev/null; or printf '%s' "$argv" | base64)
+    set -l c (printf '%s' "$argv" | base64 -w0 2>/dev/null || base64 -b 0 2>/dev/null || base64 | tr -d '\n')
     printf '\\e]6973;B;%s\\a' "$c"
 end
 function __shmakk_post --on-event fish_postexec
     set -l ec $status
-    set -l p (printf '%s' "$PWD" | base64 -w0 2>/dev/null; or printf '%s' "$PWD" | base64)
+    set -l p (printf '%s' "$PWD" | base64 -w0 2>/dev/null || base64 -b 0 2>/dev/null || base64 | tr -d '\n')
     printf '\\e]6973;C;%s\\a' $ec
     printf '\\e]6973;D;%s\\a' "$p"
 end
+# Override shmakk binary inside a session so "shmakk <cmd>" routes to
+# local self-commands instead of forking a nested shmakk process.
+# Passes through --flags to the real shmakk binary.
+function shmakk
+    if set -q argv[1]; and string match -qr '^--' -- "$argv[1]"
+        command shmakk $argv
+        return $status
+    end
+    set -l raw (printf '%s' "shmakk $argv" | base64 -w0 2>/dev/null || base64 -b 0 2>/dev/null || base64 | tr -d '\n')
+    set -l pwd_b64 (printf '%s' "$PWD" | base64 -w0 2>/dev/null || base64 -b 0 2>/dev/null || base64 | tr -d '\n')
+    printf '\\e]6973;B;%s\\a' "$raw"
+    printf '\\e]6973;C;127\\a'
+    printf '\\e]6973;D;%s\\a' "$pwd_b64"
+    return 127
+end
 `.trim();
 
 function configure() {

package/src/hooks/zsh.js

@@ -2,6 +2,28 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
+// zsh under a custom ZDOTDIR sources .zshenv, .zprofile, .zshrc, .zlogin from
+// that directory. We create all four so nothing from the user's real ZDOTDIR
+// is skipped.
+
+const ZSHENV = `
+# Source the real .zshenv so PATH and env vars are available.
+if [ -n "$SHMAKK_REAL_ZDOTDIR" ] && [ -f "$SHMAKK_REAL_ZDOTDIR/.zshenv" ]; then
+    source "$SHMAKK_REAL_ZDOTDIR/.zshenv"
+elif [ -f "$HOME/.zshenv" ]; then
+    source "$HOME/.zshenv"
+fi
+`;
+
+const ZPROFILE = `
+# Source the real .zprofile (login shell initialization).
+if [ -n "$SHMAKK_REAL_ZDOTDIR" ] && [ -f "$SHMAKK_REAL_ZDOTDIR/.zprofile" ]; then
+    source "$SHMAKK_REAL_ZDOTDIR/.zprofile"
+elif [ -f "$HOME/.zprofile" ]; then
+    source "$HOME/.zprofile"
+fi
+`;
+
 const ZSHRC = `
 # preserve real ZDOTDIR so user config is sourced
 if [ -n "$SHMAKK_REAL_ZDOTDIR" ]; then
@@ -12,13 +34,13 @@ fi
 
 __shmakk_preexec() {
     local cmd
-    cmd=$(printf '%s' "$1" | base64 -w0 2>/dev/null || printf '%s' "$1" | base64)
+    cmd=$(printf '%s' "$1" | base64 -w0 2>/dev/null || base64 -b 0 2>/dev/null || base64 | tr -d '\n')
     printf '\\e]6973;B;%s\\a' "$cmd"
 }
 __shmakk_precmd() {
     local ec=$?
     local p
-    p=$(printf '%s' "$PWD" | base64 -w0 2>/dev/null || printf '%s' "$PWD" | base64)
+    p=$(printf '%s' "$PWD" | base64 -w0 2>/dev/null || base64 -b 0 2>/dev/null || base64 | tr -d '\n')
     printf '\\e]6973;C;%s\\a' "$ec"
     printf '\\e]6973;D;%s\\a' "$p"
 }
@@ -30,7 +52,14 @@ precmd_functions+=(__shmakk_precmd)
 function configure() {
   const dir = path.join(os.tmpdir(), `shmakk-zsh-${process.pid}`);
   fs.mkdirSync(dir, { recursive: true });
+  // zsh under a custom ZDOTDIR sources .zshenv, .zprofile, .zshrc, .zlogin
+  // from that directory. We must provide all four so the user's environment
+  // is complete.
+  fs.writeFileSync(path.join(dir, '.zshenv'), ZSHENV, { mode: 0o600 });
+  fs.writeFileSync(path.join(dir, '.zprofile'), ZPROFILE, { mode: 0o600 });
   fs.writeFileSync(path.join(dir, '.zshrc'), ZSHRC, { mode: 0o600 });
+  // No .zlogin needed — zsh docs say .zlogin is for commands to run at the
+  // start of an interactive login shell; .zprofile already covers env setup.
   const realZ = process.env.ZDOTDIR || '';
   return {
     args: ['-i'],

package/src/index.js

@@ -1,4 +1,4 @@
-const { parseArgs, HELP } = require('./cli');
+const { parseArgs, HELP, resolveHelp } = require('./cli');
 const { normalizeProfile, resolveProfile } = require('./profiles');
 const { applyEndpoint, getCurrentEndpoint, getCurrentEndpointName } = require('./endpoints');
 const { ensureModelRuntime } = require('./llm');
@@ -66,7 +66,7 @@ async function main() {
   }
 
   if (opts.help) {
-    process.stdout.write(HELP);
+    process.stdout.write(resolveHelp(opts.helpCategory));
     process.exit(0);
   }
 
@@ -204,6 +204,15 @@ async function main() {
   if (opts.ttsVoice) process.env.SHMAKK_TTS_VOICE = opts.ttsVoice;
 
   const { start } = require('./orchestrator');
+
+  // Refuse to nest sessions: launching shmakk inside shmakk would
+  // create a recursive PTY tree with no benefit.
+  if (process.env.SHMAKK === '1') {
+    process.stderr.write('[shmakk] already inside an shmakk session (SHMAKK=1).\n');
+    process.stderr.write('[shmakk] use --help to see in-session commands, or exit the current session first.\n');
+    process.exit(1);
+  }
+
   const exitCode = await start(opts);
   process.exit(exitCode);
 }

package/src/llm.js

@@ -4,7 +4,7 @@ try { OpenAI = require('openai'); } catch { OpenAI = null; }
 const path = require('path');
 const os = require('os');
 const fs = require('fs');
-const { getCurrentEndpoint, getCurrentEndpointName, getModelRegistry } = require('./endpoints');
+const { getCurrentEndpoint, getCurrentEndpointName, getModelRegistry, supportsVision } = require('./endpoints');
 
 function parseHeaders(s) {
   const out = {};
@@ -536,4 +536,4 @@ function getDeepSeekOptions(taskType) {
   };
 }
 
-module.exports = { makeClient, modelFor, isConfigured, ensureModelRuntime, getDeepSeekOptions, isDeepSeekProvider };
+module.exports = { makeClient, modelFor, isConfigured, ensureModelRuntime, getDeepSeekOptions, isDeepSeekProvider, supportsVision };

package/src/mcp-client.js

@@ -212,9 +212,15 @@ class MCPServer {
         if (item.type === 'text') {
           texts.push(item.text);
         } else if (item.type === 'image') {
+          // Preserve base64 image data so vision-capable providers can process it.
+          // Cap at ~2MB of base64 to avoid blowing out context windows.
+          const raw = String(item.data || '');
+          const capped = raw.length > 2_000_000 ? raw.slice(0, 2_000_000) : raw;
           images.push({
             mimeType: item.mimeType || 'image/png',
-            dataLength: (item.data || '').length,
+            data: capped,
+            dataLength: raw.length,
+            truncated: raw.length > 2_000_000,
           });
         } else if (item.type === 'resource') {
           texts.push(`[resource: ${item.resource?.uri || 'unknown'}]`);

package/src/notify.js

@@ -2,14 +2,17 @@
 // Falls back silently if notify-send is not available or no notification
 // daemon is running.
 
-const { execFile } = require('child_process');
+const { execFile, execFileSync } = require('child_process');
+const { existsSync } = require('fs');
 
 const NOTIFY_BIN = 'notify-send';
 
 function available() {
   try {
-    const { execFileSync } = require('child_process');
-    execFileSync('which', [NOTIFY_BIN], { stdio: 'ignore' });
+    // Prefer direct path check; fall back to `command -v` if not at known paths
+    if (existsSync('/usr/bin/notify-send')) return true;
+    if (existsSync('/usr/local/bin/notify-send')) return true;
+    execFileSync('command', ['-v', NOTIFY_BIN], { stdio: 'ignore' });
     return true;
   } catch {
     return false;

package/src/pty.js

@@ -13,8 +13,8 @@ function getSize() {
 
 const VOICE_HOTKEY = 0x0f; // Ctrl+O — triggers voice recording
 
-function startSession({ debug = false, voiceEnabled = false } = {}) {
-  const shell = detectShell();
+function startSession({ debug = false, voiceEnabled = false, shellOverride = null } = {}) {
+  const shell = detectShell(shellOverride);
   const cfg = configureForShell(shell.name);
   const { cols, rows } = getSize();
 

package/src/review.js

@@ -2,13 +2,13 @@
 // optional `{ onCancel }` callback that fires when the user hits Ctrl-C.
 
 function makePrompter(pty, write, opts = {}) {
-  const { onNotify } = opts;
   return function ask(question, defaultYes, { onCancel, onWhy } = {}) {
     return new Promise((resolve) => {
-      if (onNotify) {
+      if (opts.notify) {
         try {
+          const { notify } = require('./notify');
           const body = typeof question === 'string' ? question.replace(/\x1b\[[0-9;]*m/g, '') : String(question || '');
-          onNotify('shmakk needs your attention', body.slice(0, 120));
+          notify('shmakk needs your attention', body.slice(0, 120));
         } catch {}
       }
       const tag = defaultYes ? '[Y/n/?]' : '[y/N/?]';

package/src/self-commands.js

@@ -110,12 +110,14 @@ const SELF_COMMANDS = [
   },
 
   // ── Session ──
+  // NOTE: Bare "status", "stats" etc. are NOT intercepted — they may be
+  // real shell commands. Use /status, /stats, shmakk status, etc. instead.
   {
-    patterns: [/^(?:shmakk\s+)?status$/i],
+    patterns: [/^status$/i],
     action: 'status',
   },
   {
-    patterns: [/^(?:show\s+)?stats$/i, /^session\s+stats$/i],
+    patterns: [/^stats$/i, /^session\s+stats$/i],
     action: 'stats',
   },
   {
@@ -164,8 +166,8 @@ const SELF_COMMANDS = [
   },
   {
     patterns: [
-      /^(?:show\s+)?last\s+sessions?$/i,
-      /^recent\s+sessions?$/i,
+      /^(?:show\s+)?(?:last\s+|recent\s+)?sessions?$/i,
+      /^sessions?$/i,
     ],
     action: 'last-sessions',
   },
@@ -320,6 +322,22 @@ const SELF_COMMANDS = [
     action: 'disable-yes-files',
   },
 
+  // ── Notify ──
+  {
+    patterns: [
+      /^(?:enable|turn\s+on)\s+notify$/i,
+      /^notify\s+on$/i,
+    ],
+    action: 'enable-notify',
+  },
+  {
+    patterns: [
+      /^(?:disable|turn\s+off|no)\s+notify$/i,
+      /^notify\s+off$/i,
+    ],
+    action: 'disable-notify',
+  },
+
   // ── Colors ──
   {
     patterns: [
@@ -399,20 +417,65 @@ const SELF_COMMANDS = [
   },
 ];
 
+// Self-command prefixes accepted by the shell:
+//   /cmd          — e.g. /status, /sessions, /compact
+//   shmakk cmd    — e.g. shmakk status, shmakk show sessions
+// Bare words like "status" are NOT intercepted (they go to the shell).
+const SELF_PREFIX_RE = /^\/(.+)$/;
+const SHMAKK_PREFIX_RE = /^shmakk\s+(.+)$/i;
+
+function hasSelfCommandPrefix(input) {
+  const text = String(input || '').trim();
+  return SELF_PREFIX_RE.test(text) || SHMAKK_PREFIX_RE.test(text);
+}
+
+function stripSelfCommandPrefix(input) {
+  const text = String(input || '').trim();
+  let m = SELF_PREFIX_RE.exec(text);
+  if (m) return m[1].trim();
+  m = SHMAKK_PREFIX_RE.exec(text);
+  if (m) return m[1].trim();
+  return text;
+}
+
 function matchSelfCommand(input) {
   const text = String(input || '').trim();
   if (!text) return { matched: false };
 
-  for (const entry of SELF_COMMANDS) {
-    for (const pattern of entry.patterns) {
-      const m = pattern.exec(text);
-      if (m) {
-        return {
-          matched: true,
-          action: entry.action,
-          arg: entry.needsArg && m[1] ? m[1].trim() : null,
-          confirm: !!entry.confirm,
-        };
+  // Try matching with prefix stripped first (for /status, shmakk status, etc.)
+  const stripped = stripSelfCommandPrefix(text);
+  if (stripped !== text) {
+    for (const entry of SELF_COMMANDS) {
+      for (const pattern of entry.patterns) {
+        const m = pattern.exec(stripped);
+        if (m) {
+          return {
+            matched: true,
+            action: entry.action,
+            arg: entry.needsArg && m[1] ? m[1].trim() : null,
+            confirm: !!entry.confirm,
+          };
+        }
+      }
+    }
+    return { matched: false };
+  }
+
+  // Multi-word natural-language commands (no prefix needed).
+  // Single bare words are NOT matched — they could be real shell commands.
+  const wordCount = text.split(/\s+/).length;
+  if (wordCount >= 2) {
+    for (const entry of SELF_COMMANDS) {
+      for (const pattern of entry.patterns) {
+        const m = pattern.exec(text);
+        if (m) {
+          return {
+            matched: true,
+            action: entry.action,
+            arg: entry.needsArg && m[1] ? m[1].trim() : null,
+            confirm: !!entry.confirm,
+          };
+        }
       }
     }
   }
@@ -422,6 +485,9 @@ function matchSelfCommand(input) {
 
 // ctx is optional: { opts, HELP, setColors }
 function executeSelfCommand(match, write, ctx = {}) {
+  // Update terminal tab title so self-command activity is visible from other tabs
+  const label = match.action.replace(/-/g, ' ');
+  write(`\x1b]0;${label} — shmakk\x07`);
   const ctl = require('./control');
   const opts = ctx.opts || {};
 
@@ -429,7 +495,7 @@ function executeSelfCommand(match, write, ctx = {}) {
 
     // ── Help ──
     case 'show-help': {
-      const helpText = ctx.HELP || '[shmakk] help text not available';
+      const helpText = ctx.HELP_SESSION_SUMMARY || ctx.HELP_SUMMARY || ctx.HELP || '[shmakk] help text not available';
       write(helpText.replace(/\n/g, '\r\n'));
       break;
     }
@@ -803,6 +869,18 @@ function executeSelfCommand(match, write, ctx = {}) {
       break;
     }
 
+    // ── Notify ──
+    case 'enable-notify': {
+      if (ctx.opts) ctx.opts.notify = true;
+      write('[shmakk] desktop notifications enabled\r\n');
+      break;
+    }
+    case 'disable-notify': {
+      if (ctx.opts) ctx.opts.notify = false;
+      write('[shmakk] desktop notifications disabled\r\n');
+      break;
+    }
+
     // ── Colors ──
     case 'enable-colors': {
       if (ctx.opts) ctx.opts.colors = true;
@@ -858,6 +936,8 @@ function executeSelfCommand(match, write, ctx = {}) {
     default:
       write(`[shmakk] unknown self-command: ${match.action}\r\n`);
   }
+  // Clear terminal title — shell will restore normal title on next prompt
+  write('\x1b]0;\x07');
 }
 
-module.exports = { matchSelfCommand, executeSelfCommand, SELF_COMMANDS };
+module.exports = { matchSelfCommand, executeSelfCommand, hasSelfCommandPrefix, stripSelfCommandPrefix, SELF_COMMANDS };

package/src/session.js

@@ -20,7 +20,7 @@ const { runTeam, looksMultiDomain } = require('./team');
 const { addPlanTasks, markTaskComplete, markTaskSkipped } = require('./task-file');
 const { captureGitSha, runPostPlanReview } = require('./code-reviewer');
 const sessionSearch = require('./session-search');
-const { HELP } = require('./cli');
+const { HELP, HELP_SUMMARY, HELP_SESSION_SUMMARY } = require('./cli');
 const audit = require('./audit');
 const { setMaxListeners } = require('events');
 
@@ -163,13 +163,11 @@ function makeToolConfirm(opts, ask, out, getAbort) {
 }
 
 async function runOneSession(opts, registerSession) {
-  const session = startSession({ debug: opts.debug, voiceEnabled: !!opts.voice });
+  const session = startSession({ debug: opts.debug, voiceEnabled: !!opts.voice, shellOverride: opts.shell });
   let colorsEnabled = opts.colors !== false;
   let markdownEnabled = opts.markdown !== false;
   const out = (s) => session.stdoutWrite(colorsEnabled ? s : stripAnsi(s));
-  const ask = makePrompter(session, out, {
-    onNotify: opts.notify ? (summary, body) => notify(summary, body) : null,
-  });
+  const ask = makePrompter(session, out, opts);
   const glossary = loadGlossary();
   // Workspace tracking: explicit --workspace is "pinned"; otherwise cwd
   // floats with the inner shell's `cd`. When both pinned and cwd differ,
@@ -373,6 +371,8 @@ async function runOneSession(opts, registerSession) {
       executeSelfCommand(voiceSelfCmd, out, {
         opts,
         HELP,
+        HELP_SUMMARY,
+        HELP_SESSION_SUMMARY,
         setColors: (v) => { colorsEnabled = v; },
       });
       return;
@@ -672,11 +672,20 @@ async function runOneSession(opts, registerSession) {
         executeSelfCommand(selfCmd, out, {
           opts,
           HELP,
+          HELP_SUMMARY,
+          HELP_SESSION_SUMMARY,
           setColors: (v) => { colorsEnabled = v; },
         });
         session.childWrite('\r');
         return;
       }
+      // /-prefixed and "shmakk ..." commands that didn't match a known
+      // self-command are invalid shmakk commands. Don't send them to the
+      // correction engine — the user was explicitly addressing shmakk.
+      if (/^\//.test(lastCmd) || /^shmakk\s/i.test(lastCmd)) {
+        flushPending();
+        return;
+      }
     }
 
     // Determine the command to feed forward.

package/src/shell.js

@@ -1,32 +1,52 @@
 const fs = require('fs');
 const path = require('path');
 
-function detectShell() {
+// Map shell name to the preferred executable path.
+// Resolve's dctl paths on Arch-like systems can put bash in /usr/bin instead of /bin.
+// Map shell name to candidate executable paths.
+// Ordered by likelihood on the current platform; first existing path wins.
+const SHELL_PATH_CANDIDATES = {
+  fish: ['/usr/bin/fish', '/opt/homebrew/bin/fish', '/usr/local/bin/fish', '/bin/fish'],
+  bash: ['/usr/bin/bash', '/bin/bash', '/opt/homebrew/bin/bash', '/usr/local/bin/bash'],
+  zsh: ['/usr/bin/zsh', '/bin/zsh', '/opt/homebrew/bin/zsh', '/usr/local/bin/zsh'],
+};
+
+function shellPath(name) {
+  // Name given explicitly (--shell flag): try known paths first, then PATH.
+  const candidates = SHELL_PATH_CANDIDATES[name];
+  if (candidates) {
+    for (const candidate of candidates) {
+      if (fs.existsSync(candidate)) return candidate;
+    }
+  }
+
+  // Fall back to PATH search for the requested shell.
+  const { execSync } = require('child_process');
+  try {
+    const p = execSync(`command -v ${name}`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
+    if (p && fs.existsSync(p)) return p;
+  } catch {}
+
+  return null;
+}
+
+function detectShell(shellOverride) {
+  // Explicit --shell flag overrides everything.
+  if (shellOverride) {
+    const p = shellPath(shellOverride);
+    if (p) return { path: p, name: shellOverride };
+    process.stderr.write(`[shmakk] shell "${shellOverride}" not found, falling back to default\n`);
+  }
+
   const env = process.env.SHELL;
   if (env && fs.existsSync(env)) {
     return { path: env, name: path.basename(env) };
   }
-  const fallbacks = ['/bin/bash', '/usr/bin/bash', '/bin/sh'];
+  const fallbacks = ['/bin/bash', '/usr/bin/bash', '/opt/homebrew/bin/bash', '/usr/local/bin/bash', '/bin/sh'];
   for (const f of fallbacks) {
     if (fs.existsSync(f)) return { path: f, name: path.basename(f) };
   }
   return { path: '/bin/sh', name: 'sh' };
 }
 
-function shellArgs(name) {
-  // Login + interactive so the user's normal init runs.
-  // We deliberately keep this minimal: do NOT inject rc files,
-  // do NOT alter prompt. Phase 2 will add hooks for command metadata.
-  switch (name) {
-    case 'fish':
-      return ['-i', '-l'];
-    case 'zsh':
-      return ['-i', '-l'];
-    case 'bash':
-      return ['-i', '-l'];
-    default:
-      return ['-i'];
-  }
-}
-
-module.exports = { detectShell, shellArgs };
+module.exports = { detectShell, shellPath };