lux-hammer 0.3.17 → 0.3.21

data/recipes/llm.rb

@@ -10,7 +10,8 @@ desc <<~TXT
     prompt   token-prefix prompt expander (UserPromptSubmit hook + CLI)
 
   Commands:
-    usage    Claude, Codex, and Grok subscription usage (session + week table)
+    usage    subscription limits and per-model token usage
+    wrap     run a command with your last two prompts pinned to the screen
 TXT
 
 require 'fileutils'
@@ -18,50 +19,127 @@ require 'json'
 require 'pathname'
 require 'set'
 
-_llm_root = File.dirname(Hammer::Recipe.path('llm') || File.join(Hammer::Recipe::GEM_DIR, 'llm.rb'))
+# Resolve next to this recipe file (realpath so PATH symlinks to a dev
+# checkout still load matching lib/, not an older installed gem copy).
+_llm_root = File.dirname(File.realpath(__FILE__))
 require File.join(_llm_root, 'lib/llm/usage')
 
-STORE        ||= ENV['CLAUDE_MEMORY_STORE'] || File.expand_path('~/dev/skills/memory')
+STORE        ||= ENV['CLAUDE_MEMORY_STORE'] || File.expand_path('~/dev/ai/memory')
 VALID_TYPES  ||= %w[user feedback project reference].freeze
 
 FileUtils.mkdir_p(STORE)
 
 task :usage do
   desc <<~D
-    Show subscription usage for Claude, Codex, and Grok in one table.
+    Show subscription limits and per-model token usage for Claude, Codex, and Grok.
 
     Default view lists session and weekly windows side by side.
-    Reads Codex via `codex app-server`, Grok from `~/.grok/logs/unified.jsonl`.
-    Claude has no local snapshot. Pass `month` for Claude extra-usage when enabled.
+    Local Claude, Codex, and Grok sessions provide calendar day, week, and month token totals.
+    Reads Codex via `codex app-server`; Grok billing + tokens from `~/.grok/logs/unified.jsonl`
+    (inference_done events). Claude 5h/week windows come from the statusline snapshot at
+    `~/.cache/llm/claude-limits.json`, falling back to the OAuth usage API. `month` shows
+    Claude extra-usage credits (API only, and only when you've enabled them).
   D
   example 'llm usage'
   example 'llm usage month'
   example 'llm usage --json'
   example 'llm usage --provider grok'
 
+  # :period is declared first on purpose — the parser fills un-set scalar opts
+  # from positionals in declaration order, so `llm usage month` must reach
+  # :period before :provider can claim it.
+  opt :period,   desc: 'window to show (week, month)', placeholder: 'week|month'
   opt :json,     type: :boolean, default: false, desc: 'emit JSON'
   opt :provider, desc: 'single provider (claude, codex, grok)'
 
   proc do |opts|
-    period = opts[:args].first
+    period = opts[:period]
     providers = opts[:provider] ? [opts[:provider]] : nil
     rows, notes, = LlmUsage.collect_rows(period: period, providers: providers)
+    token_rows = LlmUsage.collect_token_rows(providers: providers)
 
-    if rows.empty?
+    if rows.empty? && token_rows.empty?
       notes.each { |note| say note, :yellow }
       error 'no usage data (sign in to Claude, Codex, or Grok first)' if notes.empty?
       error 'no usage data available'
     end
 
     if opts[:json]
-      puts JSON.generate(LlmUsage.rows_to_json(rows, period: period, notes: notes))
+      puts JSON.generate(
+        LlmUsage.rows_to_json(rows, period: period, notes: notes, token_rows: token_rows)
+      )
     else
-      say LlmUsage.render_table(rows, period: period)
+      tables = []
+      tables << LlmUsage.render_table(rows, period: period) unless rows.empty?
+      tables << LlmUsage.render_token_table(token_rows) unless token_rows.empty?
+      say tables.join("\n\n")
       notes.each { |note| say note, :gray }
     end
   end
 end
 
+task :wrap do
+  desc <<~D
+    Run a command with the last few prompts you typed pinned to the bottom of the screen.
+
+    The command runs in a PTY that is shorter than the real terminal by the height of
+    the bar, so those rows belong to the bar and nothing the program draws can cover
+    them - no hooks, no tmux, no terminal-specific plumbing. Works with claude, codex,
+    a REPL, a plain shell.
+
+    The bar is a "prompt history" rule with the prompts below it, oldest first, so the
+    newest one sits on the very last line. It is --lines + 1 rows tall.
+
+    Each prompt gets one row: a multi-line prompt is flattened onto it with line breaks
+    shown as a backslash, and the whole thing is clipped to the terminal width.
+
+    A prompt is whatever you type between Enters. Shift/Option+Enter and pasted newlines
+    keep appending to the current one. This is keystroke sniffing, so text the program
+    inserts for you (history recall, autocomplete, menu picks) will not show up, and
+    nothing is captured while the program has echo off in canonical mode (sudo, ssh).
+
+    Keys are decoded from plain bytes, the kitty keyboard protocol and xterm
+    modifyOtherKeys, since a program can ask the terminal for any of the three (Claude
+    Code turns on the last two). Mouse reports, focus events, arrows and Ctrl-<key> are
+    not text and are dropped - including Ctrl-V, which pastes an image in Claude Code.
+
+    LLM_WRAP_DEBUG=<file> logs what arrived and how it was read, for when a terminal
+    reports keys in some way this does not know about. It records every keystroke.
+
+    Put `--` before the wrapped command when it has flags of its own, otherwise they are
+    parsed as flags to `llm wrap`.
+  D
+  example 'llm wrap claude'
+  example 'llm wrap -- claude --resume'
+  example 'llm wrap --lines 5 -- bash -l'
+
+  # `positional: false` is load-bearing: the parser fills un-set scalar opts
+  # from positionals in declaration order, so without it `llm wrap claude`
+  # would hand "claude" to --lines and die on the integer cast.
+  opt :lines, type: :integer, default: 3, positional: false,
+              desc: 'how many recent prompts to pin', placeholder: 'N'
+
+  proc do |opts|
+    cmd = Array(opts[:args])
+    error 'usage: llm wrap [--lines N] [--] <command> [args...]' if cmd.empty?
+
+    # Required lazily - llm.rb also runs as a per-prompt hook (`llm prompt
+    # hook`), which should not pay to load pty/io-console. `_llm_root` is a
+    # local from the file scope; the block closes over it (instance_exec
+    # rebinds self, not locals).
+    require File.join(_llm_root, 'lib/llm/wrap')
+
+    # The wrapper renames itself after the program it runs, so that a pane
+    # watcher can still see which agent is in there - which leaves nothing
+    # behind that says how the pane was started. This is that: the invocation
+    # rebuilt from what the parser gave us, since by then the real command line
+    # is a resolved interpreter chain nobody typed. `--` keeps a wrapped
+    # command's own flags out of our parser when it is read back.
+    origin = ['llm', 'wrap', '--lines', opts[:lines].to_s, '--', *cmd]
+    exit LlmWrap.run(cmd, keep: opts[:lines], origin:)
+  end
+end
+
 namespace :memory do
   # Helpers are defined inside the namespace block (class_eval'd on the
   # namespace's anonymous Hammer subclass) so the task procs reach them.
@@ -139,15 +217,21 @@ namespace :memory do
       Memory types: user, feedback, project, reference.
     DESC
     example %(echo "deep Go expertise, new to React" | llm memory write user-role --type=user --description="user profile")
+    # :name first — the parser fills scalar opts from positionals in
+    # declaration order, so without it `llm memory write foo --type=user`
+    # lands "foo" in :description instead of the memory name.
+    opt :name,        desc: 'memory name (slug)'
     opt :type,        desc: 'memory type (user|feedback|project|reference)', req: true
     opt :description, desc: 'one-line summary stored in frontmatter'
 
     proc do |opts|
-      name = opts[:args].first
+      name = opts[:name]
       error 'usage: llm memory write <name> --type=<type> [--description="..."] < body' unless name
       error "unknown type: #{opts[:type]} (valid: #{VALID_TYPES.join(', ')})" unless VALID_TYPES.include?(opts[:type])
 
-      body = $stdin.read
+      # opts[:stdin], not $stdin.read — hammer drains piped stdin into opts
+      # before the handler runs, so a direct read comes back empty.
+      body = opts[:stdin].to_s
       error 'body is empty (pipe content on stdin)' if body.strip.empty?
 
       path = memory_path(name)
@@ -465,7 +549,7 @@ namespace :prompt do
     proc do |opts|
       error '--claude or --codex required' unless opts[:claude] || opts[:codex]
 
-      raw = $stdin.read
+      raw = opts[:stdin].to_s
       prompt = begin
         JSON.parse(raw).fetch('prompt', raw)
       rescue JSON::ParserError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lux-hammer
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.21
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-12 00:00:00.000000000 Z
+date: 2026-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -46,6 +46,7 @@ files:
 - "./lib/hammer/cron_server.rb"
 - "./lib/hammer/cron_web.rb"
 - "./lib/hammer/dotenv.rb"
+- "./lib/hammer/input.rb"
 - "./lib/hammer/loader.rb"
 - "./lib/hammer/option.rb"
 - "./lib/hammer/parser.rb"
@@ -54,16 +55,8 @@ files:
 - "./lib/lux-hammer.rb"
 - "./recipes/deploy.rb"
 - "./recipes/git-helper.rb"
-- "./recipes/lib/deploy/boot.rb"
-- "./recipes/lib/deploy/commands.rb"
-- "./recipes/lib/deploy/config.rb"
-- "./recipes/lib/deploy/context.rb"
-- "./recipes/lib/deploy/doctor.rb"
-- "./recipes/lib/deploy/hammer.rb"
-- "./recipes/lib/deploy/manifest.rb"
-- "./recipes/lib/deploy/ssh.rb"
-- "./recipes/lib/deploy/template.rb"
 - "./recipes/lib/llm/usage.rb"
+- "./recipes/lib/llm/wrap.rb"
 - "./recipes/llm.rb"
 - "./recipes/srt.rb"
 - bin/hammer

data/recipes/lib/deploy/boot.rb

@@ -1,52 +0,0 @@
-require 'fileutils'
-require 'pathname'
-require 'open3'
-require 'set'
-require 'shellwords'
-require 'yaml'
-
-module LuxDeploy
-  # Recipe layout: this file and its siblings live under
-  # recipes/lib/deploy/, so ROOT points here and `templates/` sits
-  # right next to us (no gem root anymore).
-  ROOT ||= Pathname.new(__dir__)
-  VERSION ||= '0.2.0'
-
-  # Branches that select `.env` instead of `.env.staging`.
-  MAIN_BRANCHES ||= %w[master main]
-
-  # Server-side conventions. Not config-tunable because doctor and the
-  # deploy flow both hardcode these paths in the host setup. A different
-  # caddy/systemd layout means a different recipe.
-  PORT_RANGE  ||= (3010..3990).step(10).to_a
-  CADDY_SITES ||= '/etc/caddy/sites'
-  SYSTEMD_DIR ||= '/etc/systemd/system'
-
-  class Error < StandardError
-    def to_s
-      "ERROR: #{super}"
-    end
-  end
-
-  # Host-supplied defaults that sit under the user's .yaml. Set once by a
-  # wrapping plugin/Hammerfile (e.g. lux-fw seeds 'lux-web' / 'lux-apps'),
-  # consumed by Config.new. Empty by default so the recipe stays "generic".
-  @defaults = {}
-
-  class << self
-    attr_reader :defaults
-
-    def set_defaults(hash)
-      @defaults = (hash || {}).each_with_object({}) { |(k, v), h| h[k.to_s] = v }
-    end
-  end
-end
-
-require_relative 'config'
-require_relative 'ssh'
-require_relative 'template'
-require_relative 'doctor'
-require_relative 'context'
-require_relative 'manifest'
-require_relative 'commands'
-require_relative 'hammer'