freshbooks-cli 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25953e6d4250452b12f5259b0c1a0ef9e8b01e58f23e44d5ab61784af3376ffd
-  data.tar.gz: 39158a737b7709ce7533c2e10882a0b07b3c54748aa4a024ceb8c27634751833
+  metadata.gz: 7d8d73d99463668eb02e32550fe31e0c0ee32f616bd8fbfd9839df01f5a22052
+  data.tar.gz: ce0758e59c4e5631b8d84c87d8c56bdb63e87386021e27de32922e162d0dad55
 SHA512:
-  metadata.gz: 422b8d06f3058c3f33fb42c0651010c66fad65b8c95ad164a717dbf943616e9604233844ab5b315e368dfa3f8df8fbb5b3d4458ae52b284154e38badf185c684
-  data.tar.gz: 8647a569513bf939ae0df062dfd60901e623df0accfd4e4908a509e8c9feefc7241a9e30a451b2875739d7b2288f231e879e5129ae5e37f312d49d8f64ffe28d
+  metadata.gz: d21f0dd4f0d9704e736aa41b2f574c9d616e097d05a61d5e7eb23a6d39730cc9cb291178381397563e34e71fdbae7716ba25af2d8c34b4fe1da3b409f2ebc56f
+  data.tar.gz: ab9dcae6c63603ddc32aeb4519c6e4022eaa406e53a02293e1d5f7cf7c7546a1f1f3017194b3498bbcfd8de3da03be48b20ac039d8c587b6c15ff4aa7eff11a3

data/lib/fb/api.rb

@@ -71,18 +71,52 @@ module FB
         all_items
       end
 
+      # --- Cache helpers ---
+
+      def cache_fresh?
+        cache = Auth.load_cache
+        cache["updated_at"] && (Time.now.to_i - cache["updated_at"]) < 600
+      end
+
+      def cached_data(key)
+        cache = Auth.load_cache
+        return nil unless cache["updated_at"] && (Time.now.to_i - cache["updated_at"]) < 600
+        cache[key]
+      end
+
+      def update_cache(key, data)
+        cache = Auth.load_cache
+        cache["updated_at"] = Time.now.to_i
+        cache[key] = data
+        Auth.save_cache(cache)
+      end
+
       # --- Clients ---
 
-      def fetch_clients
+      def fetch_clients(force: false)
+        unless force
+          cached = cached_data("clients_data")
+          return cached if cached
+        end
+
         url = "#{BASE}/accounting/account/#{account_id}/users/clients"
-        fetch_all_pages(url, "clients")
+        results = fetch_all_pages(url, "clients")
+        update_cache("clients_data", results)
+        results
       end
 
       # --- Projects ---
 
-      def fetch_projects
+      def fetch_projects(force: false)
+        unless force
+          cached = cached_data("projects_data")
+          return cached if cached
+        end
+
         url = "#{BASE}/projects/business/#{business_id}/projects"
-        fetch_all_pages(url, "projects")
+        results = fetch_all_pages(url, "projects")
+        update_cache("projects_data", results)
+        results
       end
 
       def fetch_projects_for_client(client_id)
@@ -92,7 +126,12 @@ module FB
 
       # --- Services ---
 
-      def fetch_services
+      def fetch_services(force: false)
+        unless force
+          cached = cached_data("services_data")
+          return cached if cached
+        end
+
         url = "#{BASE}/comments/business/#{business_id}/services"
         response = HTTParty.get(url, { headers: headers })
 
@@ -104,7 +143,9 @@ module FB
 
         data = response.parsed_response
         services_hash = data.dig("result", "services") || {}
-        services_hash.values
+        results = services_hash.values
+        update_cache("services_data", results)
+        results
       end
 
       # --- Time Entries ---
@@ -117,6 +158,20 @@ module FB
         fetch_all_pages(url, "time_entries", params: params)
       end
 
+      def fetch_time_entry(entry_id)
+        url = "#{BASE}/timetracking/business/#{business_id}/time_entries/#{entry_id}"
+        response = HTTParty.get(url, { headers: headers })
+
+        unless response.success?
+          body = response.parsed_response
+          msg = extract_error(body) || response.body
+          abort("API error: #{msg}")
+        end
+
+        data = response.parsed_response
+        data.dig("result", "time_entry") || data.dig("time_entry")
+      end
+
       def create_time_entry(entry)
         url = "#{BASE}/timetracking/business/#{business_id}/time_entries"
         body = { time_entry: entry }
@@ -135,21 +190,56 @@ module FB
         response.parsed_response
       end
 
+      def update_time_entry(entry_id, fields)
+        url = "#{BASE}/timetracking/business/#{business_id}/time_entries/#{entry_id}"
+        body = { time_entry: fields }
+
+        response = HTTParty.put(url, {
+          headers: headers,
+          body: body.to_json
+        })
+
+        unless response.success?
+          body = response.parsed_response
+          msg = extract_error(body) || response.body
+          abort("API error: #{msg}")
+        end
+
+        response.parsed_response
+      end
+
+      def delete_time_entry(entry_id)
+        url = "#{BASE}/timetracking/business/#{business_id}/time_entries/#{entry_id}"
+
+        response = HTTParty.delete(url, { headers: headers })
+
+        unless response.success?
+          body = response.parsed_response
+          msg = extract_error(body) || response.body
+          abort("API error: #{msg}")
+        end
+
+        true
+      end
+
       # --- Name Resolution (for entries display) ---
 
       def build_name_maps
         cache = Auth.load_cache
         now = Time.now.to_i
 
-        if cache["updated_at"] && (now - cache["updated_at"]) < 600
+        if cache["updated_at"] && (now - cache["updated_at"]) < 600 &&
+           cache["clients"] && !cache["clients"].empty?
           return {
             clients: (cache["clients"] || {}),
-            projects: (cache["projects"] || {})
+            projects: (cache["projects"] || {}),
+            services: (cache["services"] || {})
           }
         end
 
-        clients = fetch_clients
-        projects = fetch_projects
+        clients = fetch_clients(force: true)
+        projects = fetch_projects(force: true)
+        services = fetch_services(force: true)
 
         client_map = {}
         clients.each do |c|
@@ -163,14 +253,26 @@ module FB
           project_map[p["id"].to_s] = p["title"]
         end
 
-        cache_data = {
-          "updated_at" => now,
-          "clients" => client_map,
-          "projects" => project_map
-        }
-        Auth.save_cache(cache_data)
+        service_map = {}
+        services.each do |s|
+          service_map[s["id"].to_s] = s["name"]
+        end
+
+        # Also collect services embedded in projects
+        projects.each do |p|
+          (p["services"] || []).each do |s|
+            service_map[s["id"].to_s] ||= s["name"]
+          end
+        end
+
+        cache = Auth.load_cache
+        cache["updated_at"] = now
+        cache["clients"] = client_map
+        cache["projects"] = project_map
+        cache["services"] = service_map
+        Auth.save_cache(cache)
 
-        { clients: client_map, projects: project_map }
+        { clients: client_map, projects: project_map, services: service_map }
       end
 
       private

data/lib/fb/auth.rb

@@ -94,6 +94,55 @@ module FB
         config
       end
 
+      def setup_config_from_args(client_id, client_secret)
+        abort("Missing --client-id") if client_id.nil? || client_id.empty?
+        abort("Missing --client-secret") if client_secret.nil? || client_secret.empty?
+
+        config = { "client_id" => client_id, "client_secret" => client_secret }
+        save_config(config)
+        config
+      end
+
+      def authorize_url(config)
+        "#{AUTH_URL}?client_id=#{config["client_id"]}&response_type=code&redirect_uri=#{URI.encode_www_form_component(REDIRECT_URI)}"
+      end
+
+      def extract_code_from_url(redirect_url)
+        uri = URI.parse(redirect_url)
+        params = URI.decode_www_form(uri.query || "").to_h
+        params["code"]
+      end
+
+      def auth_status
+        config = load_config
+        tokens = load_tokens
+        {
+          "config_exists" => !config.nil?,
+          "config_path" => config_path,
+          "tokens_exist" => !tokens.nil?,
+          "tokens_expired" => tokens ? token_expired?(tokens) : nil,
+          "business_id" => config&.dig("business_id"),
+          "account_id" => config&.dig("account_id")
+        }
+      end
+
+      def fetch_businesses(access_token)
+        identity = fetch_identity(access_token)
+        memberships = identity.dig("business_memberships") || []
+        memberships.select { |m| m.dig("business", "account_id") }
+      end
+
+      def select_business(config, business_id, businesses)
+        selected = businesses.find { |m| m.dig("business", "id").to_s == business_id.to_s }
+        abort("Business not found: #{business_id}. Available: #{businesses.map { |m| "#{m.dig("business", "name")} (#{m.dig("business", "id")})" }.join(", ")}") unless selected
+
+        biz = selected["business"]
+        config["business_id"] = biz["id"]
+        config["account_id"] = biz["account_id"]
+        save_config(config)
+        config
+      end
+
       def require_config
         config = load_config
         return config if config

data/lib/fb/cli.rb

@@ -10,6 +10,9 @@ module FB
       true
     end
 
+    class_option :no_interactive, type: :boolean, default: false, desc: "Disable interactive prompts (auto-detected when not a TTY)"
+    class_option :format, type: :string, desc: "Output format: table (default) or json"
+
     # --- version ---
 
     desc "version", "Print the current version"
@@ -19,12 +22,153 @@ module FB
 
     # --- auth ---
 
-    desc "auth", "Authenticate with FreshBooks via OAuth2"
-    def auth
-      config = Auth.require_config
-      tokens = Auth.authorize(config)
-      Auth.discover_business(tokens["access_token"], config)
-      puts "\nReady to go! Try: fb entries"
+    desc "auth [SUBCOMMAND] [ARGS]", "Authenticate with FreshBooks via OAuth2 (subcommands: setup, url, callback, status)"
+    method_option :client_id, type: :string, desc: "OAuth client ID (for setup)"
+    method_option :client_secret, type: :string, desc: "OAuth client secret (for setup)"
+    def auth(subcommand = nil, *args)
+      case subcommand
+      when "setup"
+        config = Auth.setup_config_from_args(options[:client_id], options[:client_secret])
+        if options[:format] == "json"
+          puts JSON.pretty_generate({ "config_path" => Auth.config_path, "status" => "saved" })
+        else
+          puts "Config saved to #{Auth.config_path}"
+        end
+
+      when "url"
+        config = Auth.load_config
+        abort("No config found. Run: fb auth setup --client-id ID --client-secret SECRET") unless config
+        url = Auth.authorize_url(config)
+        if options[:format] == "json"
+          puts JSON.pretty_generate({ "url" => url })
+        else
+          puts url
+        end
+
+      when "callback"
+        config = Auth.load_config
+        abort("No config found. Run: fb auth setup --client-id ID --client-secret SECRET") unless config
+        redirect_url = args.first
+        abort("Usage: fb auth callback REDIRECT_URL") unless redirect_url
+        code = Auth.extract_code_from_url(redirect_url)
+        abort("Could not find 'code' parameter in the URL.") unless code
+        tokens = Auth.exchange_code(config, code)
+
+        # Auto-discover businesses
+        businesses = Auth.fetch_businesses(tokens["access_token"])
+        if businesses.length == 1
+          Auth.select_business(config, businesses.first.dig("business", "id"), businesses)
+          biz = businesses.first["business"]
+          if options[:format] == "json"
+            puts JSON.pretty_generate({ "status" => "authenticated", "business" => biz })
+          else
+            puts "Business auto-selected: #{biz["name"]} (#{biz["id"]})"
+          end
+        else
+          if options[:format] == "json"
+            biz_list = businesses.map { |m| m["business"] }
+            puts JSON.pretty_generate({ "status" => "authenticated", "businesses" => biz_list, "business_selected" => false })
+          else
+            puts "Authenticated! Multiple businesses found — select one with: fb business --select ID"
+            businesses.each do |m|
+              biz = m["business"]
+              puts "  #{biz["name"]} (ID: #{biz["id"]})"
+            end
+          end
+        end
+
+      when "status"
+        status_data = Auth.auth_status
+        if options[:format] == "json"
+          puts JSON.pretty_generate(status_data)
+        else
+          puts "Config: #{status_data["config_exists"] ? "found" : "missing"} (#{status_data["config_path"]})"
+          puts "Tokens: #{status_data["tokens_exist"] ? "found" : "missing"}"
+          if status_data["tokens_exist"]
+            puts "Expired: #{status_data["tokens_expired"] ? "yes" : "no"}"
+          end
+          puts "Business ID: #{status_data["business_id"] || "not set"}"
+          puts "Account ID: #{status_data["account_id"] || "not set"}"
+        end
+
+      else
+        unless interactive?
+          abort("Use auth subcommands for non-interactive auth: fb auth setup, fb auth url, fb auth callback, fb auth status")
+        end
+        config = Auth.require_config
+        tokens = Auth.authorize(config)
+        Auth.discover_business(tokens["access_token"], config)
+        puts "\nReady to go! Try: fb entries"
+      end
+    end
+
+    # --- business ---
+
+    desc "business", "List or select a business"
+    method_option :select, type: :string, desc: "Set active business by ID (omit value for interactive picker)"
+    def business
+      Auth.valid_access_token
+      config = Auth.load_config
+      tokens = Auth.load_tokens
+      businesses = Auth.fetch_businesses(tokens["access_token"])
+
+      if businesses.empty?
+        abort("No business memberships found on your FreshBooks account.")
+      end
+
+      if options[:select]
+        Auth.select_business(config, options[:select], businesses)
+        selected = businesses.find { |m| m.dig("business", "id").to_s == options[:select].to_s }
+        biz = selected["business"]
+        if options[:format] == "json"
+          puts JSON.pretty_generate(biz)
+        else
+          puts "Active business: #{biz["name"]} (#{biz["id"]})"
+        end
+        return
+      end
+
+      if options.key?("select") && options[:select].nil?
+        # --select with no value: interactive picker
+        unless interactive?
+          abort("Non-interactive: use --select ID. Available businesses:\n" +
+            businesses.map { |m| "  #{m.dig("business", "name")} (ID: #{m.dig("business", "id")})" }.join("\n"))
+        end
+
+        puts "\nBusinesses:\n\n"
+        businesses.each_with_index do |m, i|
+          biz = m["business"]
+          active = biz["id"].to_s == config["business_id"].to_s ? " [active]" : ""
+          puts "  #{i + 1}. #{biz["name"]} (#{biz["id"]})#{active}"
+        end
+
+        print "\nSelect business (1-#{businesses.length}): "
+        input = $stdin.gets&.strip
+        abort("Cancelled.") if input.nil? || input.empty?
+
+        idx = input.to_i - 1
+        abort("Invalid selection.") if idx < 0 || idx >= businesses.length
+
+        selected_biz = businesses[idx]
+        Auth.select_business(config, selected_biz.dig("business", "id"), businesses)
+        puts "Active business: #{selected_biz.dig("business", "name")} (#{selected_biz.dig("business", "id")})"
+        return
+      end
+
+      # Default: list businesses
+      if options[:format] == "json"
+        biz_list = businesses.map do |m|
+          biz = m["business"]
+          biz.merge("active" => biz["id"].to_s == config["business_id"].to_s)
+        end
+        puts JSON.pretty_generate(biz_list)
+      else
+        businesses.each do |m|
+          biz = m["business"]
+          active = biz["id"].to_s == config["business_id"].to_s ? " [active]" : ""
+          puts "#{biz["name"]} (ID: #{biz["id"]})#{active}"
+        end
+      end
     end
 
     # --- log ---
@@ -40,25 +184,26 @@ module FB
     def log
       Auth.valid_access_token
       defaults = Auth.load_defaults
-      interactive = !(options[:client] && options[:duration] && options[:note])
 
-      client = select_client(defaults, interactive)
-      project = select_project(client["id"], defaults, interactive)
-      service = select_service(defaults, interactive)
-      date = pick_date(interactive)
-      duration_hours = pick_duration(interactive)
-      note = pick_note(interactive)
+      client = select_client(defaults)
+      project = select_project(client["id"], defaults)
+      service = select_service(defaults, project)
+      date = pick_date
+      duration_hours = pick_duration
+      note = pick_note
 
       client_name = display_name(client)
 
-      puts "\n--- Time Entry Summary ---"
-      puts "  Client:   #{client_name}"
-      puts "  Project:  #{project ? project["title"] : "(none)"}"
-      puts "  Service:  #{service ? service["name"] : "(none)"}"
-      puts "  Date:     #{date}"
-      puts "  Duration: #{duration_hours}h"
-      puts "  Note:     #{note}"
-      puts "--------------------------\n\n"
+      unless options[:format] == "json"
+        puts "\n--- Time Entry Summary ---"
+        puts "  Client:   #{client_name}"
+        puts "  Project:  #{project ? project["title"] : "(none)"}"
+        puts "  Service:  #{service ? service["name"] : "(none)"}"
+        puts "  Date:     #{date}"
+        puts "  Duration: #{duration_hours}h"
+        puts "  Note:     #{note}"
+        puts "--------------------------\n\n"
+      end
 
       unless options[:yes]
         print "Submit? (Y/n): "
@@ -70,14 +215,19 @@ module FB
         "is_logged" => true,
         "duration" => (duration_hours * 3600).to_i,
         "note" => note,
-        "started_at" => date,
+        "started_at" => normalize_datetime(date),
         "client_id" => client["id"]
       }
       entry["project_id"] = project["id"] if project
       entry["service_id"] = service["id"] if service
 
-      Api.create_time_entry(entry)
-      puts "Time entry created!"
+      result = Api.create_time_entry(entry)
+
+      if options[:format] == "json"
+        puts JSON.pretty_generate(result)
+      else
+        puts "Time entry created!"
+      end
 
       new_defaults = { "client_id" => client["id"] }
       new_defaults["project_id"] = project["id"] if project
@@ -92,7 +242,6 @@ module FB
     method_option :year, type: :numeric, desc: "Year"
     method_option :from, type: :string, desc: "Start date (YYYY-MM-DD)"
     method_option :to, type: :string, desc: "End date (YYYY-MM-DD)"
-    method_option :format, type: :string, default: "table", desc: "Output format: table or json"
     def entries
       Auth.valid_access_token
 
@@ -124,7 +273,11 @@ module FB
       end
 
       if entries.empty?
-        puts "No time entries#{label ? " #{label}" : ""}."
+        if options[:format] == "json"
+          puts "[]"
+        else
+          puts "No time entries#{label ? " #{label}" : ""}."
+        end
         return
       end
 
@@ -140,29 +293,287 @@ module FB
         date = e["started_at"] || "?"
         client = maps[:clients][e["client_id"].to_s] || e["client_id"].to_s
         project = maps[:projects][e["project_id"].to_s] || "-"
+        service = maps[:services][e["service_id"].to_s] || "-"
         note = (e["note"] || "").slice(0, 50)
         hours = (e["duration"].to_i / 3600.0).round(2)
-        [date, client, project, note, "#{hours}h"]
+        [e["id"].to_s, date, client, project, service, note, "#{hours}h"]
       end
 
-      headers = ["Date", "Client", "Project", "Note", "Duration"]
-      widths = headers.each_with_index.map do |h, i|
-        [h.length, *rows.map { |r| r[i].to_s.length }].max
-      end
-
-      fmt = widths.map { |w| "%-#{w}s" }.join("  ")
-      puts fmt % headers
-      puts widths.map { |w| "-" * w }.join("  ")
-      rows.each { |r| puts fmt % r }
+      print_table(["ID", "Date", "Client", "Project", "Service", "Note", "Duration"], rows)
 
       total = entries.sum { |e| e["duration"].to_i } / 3600.0
       puts "\nTotal: #{total.round(2)}h"
     end
 
+    # --- clients ---
+
+    desc "clients", "List all clients"
+    def clients
+      Auth.valid_access_token
+      clients = Spinner.spin("Fetching clients") { Api.fetch_clients }
+
+      if clients.empty?
+        puts "No clients found."
+        return
+      end
+
+      if options[:format] == "json"
+        puts JSON.pretty_generate(clients)
+        return
+      end
+
+      rows = clients.map do |c|
+        name = c["organization"]
+        name = "#{c["fname"]} #{c["lname"]}" if name.nil? || name.empty?
+        email = c["email"] || "-"
+        org = c["organization"] || "-"
+        [name, email, org]
+      end
+
+      print_table(["Name", "Email", "Organization"], rows)
+    end
+
+    # --- projects ---
+
+    desc "projects", "List all projects"
+    method_option :client, type: :string, desc: "Filter by client name"
+    def projects
+      Auth.valid_access_token
+      maps = Spinner.spin("Resolving names") { Api.build_name_maps }
+
+      projects = if options[:client]
+        client_id = maps[:clients].find { |_id, name| name.downcase == options[:client].downcase }&.first
+        abort("Client not found: #{options[:client]}") unless client_id
+        Spinner.spin("Fetching projects") { Api.fetch_projects_for_client(client_id) }
+      else
+        Spinner.spin("Fetching projects") { Api.fetch_projects }
+      end
+
+      if projects.empty?
+        puts "No projects found."
+        return
+      end
+
+      if options[:format] == "json"
+        puts JSON.pretty_generate(projects)
+        return
+      end
+
+      rows = projects.map do |p|
+        client_name = maps[:clients][p["client_id"].to_s] || "-"
+        [p["title"], client_name, p["active"] ? "active" : "inactive"]
+      end
+
+      print_table(["Title", "Client", "Status"], rows)
+    end
+
+    # --- services ---
+
+    desc "services", "List all services"
+    def services
+      Auth.valid_access_token
+      services = Spinner.spin("Fetching services") { Api.fetch_services }
+
+      if services.empty?
+        puts "No services found."
+        return
+      end
+
+      if options[:format] == "json"
+        puts JSON.pretty_generate(services)
+        return
+      end
+
+      rows = services.map do |s|
+        billable = s["billable"] ? "yes" : "no"
+        [s["name"], billable]
+      end
+
+      print_table(["Name", "Billable"], rows)
+    end
+
+    # --- status ---
+
+    desc "status", "Show hours summary for today, this week, and this month"
+    def status
+      Auth.valid_access_token
+      today = Date.today
+      week_start = today - ((today.wday - 1) % 7)
+      month_start = Date.new(today.year, today.month, 1)
+
+      entries = Spinner.spin("Fetching time entries") do
+        Api.fetch_time_entries(started_from: month_start.to_s, started_to: today.to_s)
+      end
+      maps = Spinner.spin("Resolving names") { Api.build_name_maps }
+
+      today_entries = entries.select { |e| e["started_at"] == today.to_s }
+      week_entries = entries.select { |e| d = e["started_at"]; d && d >= week_start.to_s && d <= today.to_s }
+      month_entries = entries
+
+      if options[:format] == "json"
+        puts JSON.pretty_generate({
+          "today" => build_status_data(today.to_s, today.to_s, today_entries, maps),
+          "this_week" => build_status_data(week_start.to_s, today.to_s, week_entries, maps),
+          "this_month" => build_status_data(month_start.to_s, today.to_s, month_entries, maps)
+        })
+        return
+      end
+
+      print_status_section("Today (#{today})", today_entries, maps)
+      print_status_section("This Week (#{week_start} to #{today})", week_entries, maps)
+      print_status_section("This Month (#{month_start} to #{today})", month_entries, maps)
+    end
+
+    # --- delete ---
+
+    desc "delete", "Delete a time entry"
+    method_option :id, type: :numeric, desc: "Time entry ID (skip interactive picker)"
+    method_option :yes, type: :boolean, default: false, desc: "Skip confirmation"
+    def delete
+      Auth.valid_access_token
+
+      if options[:id]
+        entry_id = options[:id]
+      else
+        abort("Missing required flag: --id") unless interactive?
+        entry_id = pick_entry_interactive("delete")
+      end
+
+      unless options[:yes]
+        print "Delete entry #{entry_id}? (y/N): "
+        answer = $stdin.gets&.strip&.downcase
+        abort("Cancelled.") unless answer == "y"
+      end
+
+      Spinner.spin("Deleting time entry") { Api.delete_time_entry(entry_id) }
+
+      if options[:format] == "json"
+        puts JSON.pretty_generate({ "id" => entry_id, "deleted" => true })
+      else
+        puts "Time entry #{entry_id} deleted."
+      end
+    end
+
+    # --- edit ---
+
+    desc "edit", "Edit a time entry"
+    method_option :id, type: :numeric, desc: "Time entry ID (skip interactive picker)"
+    method_option :duration, type: :numeric, desc: "New duration in hours"
+    method_option :note, type: :string, desc: "New note"
+    method_option :date, type: :string, desc: "New date (YYYY-MM-DD)"
+    method_option :client, type: :string, desc: "New client name"
+    method_option :project, type: :string, desc: "New project name"
+    method_option :service, type: :string, desc: "New service name"
+    method_option :yes, type: :boolean, default: false, desc: "Skip confirmation"
+    def edit
+      Auth.valid_access_token
+
+      if options[:id]
+        entry_id = options[:id]
+      else
+        abort("Missing required flag: --id") unless interactive?
+        entry_id = pick_entry_interactive("edit")
+      end
+
+      entry = Spinner.spin("Fetching time entry") { Api.fetch_time_entry(entry_id) }
+      abort("Time entry not found.") unless entry
+
+      maps = Spinner.spin("Resolving names") { Api.build_name_maps }
+      has_edit_flags = options[:duration] || options[:note] || options[:date] || options[:client] || options[:project] || options[:service]
+      scripted = has_edit_flags || !interactive?
+
+      fields = build_edit_fields(entry, maps, scripted)
+
+      current_client = maps[:clients][entry["client_id"].to_s] || entry["client_id"].to_s
+      current_project = maps[:projects][entry["project_id"].to_s] || "-"
+      current_hours = (entry["duration"].to_i / 3600.0).round(2)
+      new_hours = fields["duration"] ? (fields["duration"].to_i / 3600.0).round(2) : current_hours
+
+      unless options[:format] == "json"
+        puts "\n--- Edit Summary ---"
+        puts "  Date:     #{fields["started_at"] || entry["started_at"]}"
+        puts "  Client:   #{fields["client_id"] ? maps[:clients][fields["client_id"].to_s] : current_client}"
+        puts "  Project:  #{fields["project_id"] ? maps[:projects][fields["project_id"].to_s] : current_project}"
+        puts "  Duration: #{new_hours}h"
+        puts "  Note:     #{fields["note"] || entry["note"]}"
+        puts "--------------------\n\n"
+      end
+
+      unless options[:yes]
+        print "Save changes? (Y/n): "
+        answer = $stdin.gets&.strip&.downcase
+        abort("Cancelled.") if answer == "n"
+      end
+
+      result = Spinner.spin("Updating time entry") { Api.update_time_entry(entry_id, fields) }
+
+      if options[:format] == "json"
+        puts JSON.pretty_generate(result)
+      else
+        puts "Time entry #{entry_id} updated."
+      end
+    end
+
+    # --- cache ---
+
+    desc "cache SUBCOMMAND", "Manage cached data (refresh, clear, status)"
+    def cache(subcommand = "status")
+      case subcommand
+      when "refresh"
+        Auth.valid_access_token
+        Spinner.spin("Refreshing cache") do
+          Api.fetch_clients(force: true)
+          Api.fetch_projects(force: true)
+          Api.fetch_services(force: true)
+          Api.build_name_maps
+        end
+        puts "Cache refreshed."
+      when "clear"
+        if File.exist?(Auth.cache_path)
+          File.delete(Auth.cache_path)
+          puts "Cache cleared."
+        else
+          puts "No cache file found."
+        end
+      when "status"
+        cache = Auth.load_cache
+        if options[:format] == "json"
+          if cache["updated_at"]
+            age = Time.now.to_i - cache["updated_at"]
+            puts JSON.pretty_generate({
+              "updated_at" => cache["updated_at"],
+              "age_seconds" => age,
+              "fresh" => age < 600,
+              "clients" => (cache["clients_data"] || []).length,
+              "projects" => (cache["projects_data"] || []).length,
+              "services" => (cache["services"] || cache["services_data"] || {}).length
+            })
+          else
+            puts JSON.pretty_generate({ "fresh" => false, "clients" => 0, "projects" => 0, "services" => 0 })
+          end
+          return
+        end
+
+        if cache["updated_at"]
+          age = Time.now.to_i - cache["updated_at"]
+          updated = Time.at(cache["updated_at"]).strftime("%Y-%m-%d %H:%M:%S")
+          fresh = age < 600
+          puts "Cache updated: #{updated}"
+          puts "Age: #{age}s (#{fresh ? "fresh" : "stale"})"
+          puts "Clients: #{(cache["clients_data"] || []).length}"
+          puts "Projects: #{(cache["projects_data"] || []).length}"
+          puts "Services: #{(cache["services"] || cache["services_data"] || {}).length}"
+        else
+          puts "No cache data."
+        end
+      else
+        abort("Unknown cache subcommand: #{subcommand}. Use: refresh, clear, status")
+      end
+    end
+
     # --- help ---
 
     desc "help [COMMAND]", "Describe available commands or one specific command"
-    method_option :format, type: :string, desc: "Output format: text (default) or json"
     def help(command = nil)
       if options[:format] == "json"
         puts JSON.pretty_generate(help_json)
@@ -173,7 +584,12 @@ module FB
 
     private
 
-    def select_client(defaults, interactive)
+    def interactive?
+      return false if options[:no_interactive]
+      $stdin.tty?
+    end
+
+    def select_client(defaults)
       clients = Spinner.spin("Fetching clients") { Api.fetch_clients }
 
       if options[:client]
@@ -184,6 +600,15 @@ module FB
 
       abort("No clients found.") if clients.empty?
 
+      unless interactive?
+        # Non-interactive: auto-select if single, abort with list if multiple
+        default_client = clients.find { |c| c["id"].to_i == defaults["client_id"].to_i }
+        return default_client if default_client
+        return clients.first if clients.length == 1
+        names = clients.map { |c| display_name(c) }.join(", ")
+        abort("Multiple clients found. Use --client to specify: #{names}")
+      end
+
       puts "\nClients:\n\n"
       clients.each_with_index do |c, i|
         name = display_name(c)
@@ -206,7 +631,7 @@ module FB
       clients[idx]
     end
 
-    def select_project(client_id, defaults, interactive)
+    def select_project(client_id, defaults)
       projects = Spinner.spin("Fetching projects") { Api.fetch_projects_for_client(client_id) }
 
       if options[:project]
@@ -217,6 +642,14 @@ module FB
 
       return nil if projects.empty?
 
+      unless interactive?
+        # Non-interactive: auto-select if single, return nil if multiple (optional)
+        default_project = projects.find { |p| p["id"].to_i == defaults["project_id"].to_i }
+        return default_project if default_project
+        return projects.first if projects.length == 1
+        return nil
+      end
+
       puts "\nProjects:\n\n"
       projects.each_with_index do |p, i|
         default_marker = p["id"].to_i == defaults["project_id"].to_i ? " [default]" : ""
@@ -237,17 +670,28 @@ module FB
       projects[idx]
     end
 
-    def select_service(defaults, interactive)
+    def select_service(defaults, project = nil)
+      # Use project-scoped services if available, fall back to global
+      services = if project && project["services"] && !project["services"].empty?
+        project["services"]
+      else
+        Spinner.spin("Fetching services") { Api.fetch_services }
+      end
+
       if options[:service]
-        services = Spinner.spin("Fetching services") { Api.fetch_services }
         match = services.find { |s| s["name"].downcase == options[:service].downcase }
         abort("Service not found: #{options[:service]}") unless match
         return match
       end
 
-      return nil unless interactive
+      unless interactive?
+        # Non-interactive: auto-select if single, use default if set, otherwise skip
+        default_service = services.find { |s| s["id"].to_i == defaults["service_id"].to_i }
+        return default_service if default_service
+        return services.first if services.length == 1
+        return nil
+      end
 
-      services = Spinner.spin("Fetching services") { Api.fetch_services }
       return nil if services.empty?
 
       puts "\nServices:\n\n"
@@ -270,35 +714,175 @@ module FB
       services[idx]
     end
 
-    def pick_date(interactive)
+    def pick_date
       return options[:date] if options[:date]
 
       today = Date.today.to_s
-      return today unless interactive
+      return today unless interactive?
 
       print "\nDate [#{today}]: "
       input = $stdin.gets&.strip
       (input.nil? || input.empty?) ? today : input
     end
 
-    def pick_duration(interactive)
+    def pick_duration
       return options[:duration] if options[:duration]
 
+      abort("Missing required flag: --duration") unless interactive?
+
       print "\nDuration (hours): "
       input = $stdin.gets&.strip
       abort("Duration is required.") if input.nil? || input.empty?
       input.to_f
     end
 
-    def pick_note(interactive)
+    def pick_note
       return options[:note] if options[:note]
 
+      abort("Missing required flag: --note") unless interactive?
+
       print "\nNote: "
       input = $stdin.gets&.strip
       abort("Note is required.") if input.nil? || input.empty?
       input
     end
 
+    def print_table(headers, rows)
+      widths = headers.each_with_index.map do |h, i|
+        [h.length, *rows.map { |r| r[i].to_s.length }].max
+      end
+
+      fmt = widths.map { |w| "%-#{w}s" }.join("  ")
+      puts fmt % headers
+      puts widths.map { |w| "-" * w }.join("  ")
+      rows.each { |r| puts fmt % r }
+    end
+
+    def print_status_section(title, entries, maps)
+      puts "\n#{title}"
+      if entries.empty?
+        puts "  No entries."
+        return
+      end
+
+      grouped = {}
+      entries.each do |e|
+        client = maps[:clients][e["client_id"].to_s] || e["client_id"].to_s
+        project = maps[:projects][e["project_id"].to_s] || "-"
+        key = "#{client} / #{project}"
+        grouped[key] ||= 0.0
+        grouped[key] += e["duration"].to_i / 3600.0
+      end
+
+      grouped.each do |key, hours|
+        puts "  #{key}: #{hours.round(2)}h"
+      end
+
+      total = entries.sum { |e| e["duration"].to_i } / 3600.0
+      puts "  Total: #{total.round(2)}h"
+    end
+
+    def build_status_data(from, to, entries, maps)
+      entry_data = entries.map do |e|
+        {
+          "id" => e["id"],
+          "client" => maps[:clients][e["client_id"].to_s] || e["client_id"].to_s,
+          "project" => maps[:projects][e["project_id"].to_s] || "-",
+          "duration" => e["duration"],
+          "hours" => (e["duration"].to_i / 3600.0).round(2),
+          "note" => e["note"],
+          "started_at" => e["started_at"]
+        }
+      end
+      total = entries.sum { |e| e["duration"].to_i } / 3600.0
+      { "from" => from, "to" => to, "entries" => entry_data, "total_hours" => total.round(2) }
+    end
+
+    def pick_entry_interactive(action)
+      today = Date.today.to_s
+      entries = Spinner.spin("Fetching today's entries") do
+        Api.fetch_time_entries(started_from: today, started_to: today)
+      end
+      abort("No entries found for today.") if entries.empty?
+
+      maps = Spinner.spin("Resolving names") { Api.build_name_maps }
+
+      puts "\nToday's entries:\n\n"
+      entries.each_with_index do |e, i|
+        client = maps[:clients][e["client_id"].to_s] || e["client_id"].to_s
+        hours = (e["duration"].to_i / 3600.0).round(2)
+        note = (e["note"] || "").slice(0, 40)
+        puts "  #{i + 1}. [#{e["id"]}] #{client} — #{hours}h — #{note}"
+      end
+
+      print "\nSelect entry to #{action} (1-#{entries.length}): "
+      input = $stdin.gets&.strip
+      abort("Cancelled.") if input.nil? || input.empty?
+
+      idx = input.to_i - 1
+      abort("Invalid selection.") if idx < 0 || idx >= entries.length
+      entries[idx]["id"]
+    end
+
+    def build_edit_fields(entry, maps, scripted)
+      # FreshBooks API replaces the entry — always include all current fields
+      fields = {
+        "started_at" => entry["started_at"],
+        "is_logged" => entry["is_logged"] || true,
+        "duration" => entry["duration"],
+        "note" => entry["note"],
+        "client_id" => entry["client_id"],
+        "project_id" => entry["project_id"],
+        "service_id" => entry["service_id"]
+      }
+
+      if scripted
+        fields["duration"] = (options[:duration] * 3600).to_i if options[:duration]
+        fields["note"] = options[:note] if options[:note]
+        fields["started_at"] = normalize_datetime(options[:date]) if options[:date]
+
+        if options[:client]
+          client_id = maps[:clients].find { |_id, name| name.downcase == options[:client].downcase }&.first
+          abort("Client not found: #{options[:client]}") unless client_id
+          fields["client_id"] = client_id.to_i
+        end
+
+        if options[:project]
+          project_id = maps[:projects].find { |_id, name| name.downcase == options[:project].downcase }&.first
+          abort("Project not found: #{options[:project]}") unless project_id
+          fields["project_id"] = project_id.to_i
+        end
+
+        if options[:service]
+          service_id = maps[:services].find { |_id, name| name.downcase == options[:service].downcase }&.first
+          abort("Service not found: #{options[:service]}") unless service_id
+          fields["service_id"] = service_id.to_i
+        end
+      else
+        current_hours = (entry["duration"].to_i / 3600.0).round(2)
+        print "\nDuration (hours) [#{current_hours}]: "
+        input = $stdin.gets&.strip
+        fields["duration"] = (input.to_f * 3600).to_i unless input.nil? || input.empty?
+
+        current_note = entry["note"] || ""
+        print "Note [#{current_note}]: "
+        input = $stdin.gets&.strip
+        fields["note"] = input unless input.nil? || input.empty?
+
+        current_date = entry["started_at"] || ""
+        print "Date [#{current_date}]: "
+        input = $stdin.gets&.strip
+        fields["started_at"] = input unless input.nil? || input.empty?
+      end
+
+      fields
+    end
+
+    def normalize_datetime(date_str)
+      return date_str if date_str.include?("T")
+      "#{date_str}T00:00:00Z"
+    end
+
     def display_name(client)
       name = client["organization"]
       (name.nil? || name.empty?) ? "#{client["fname"]} #{client["lname"]}" : name
@@ -309,23 +893,46 @@ module FB
         name: "fb",
         description: "FreshBooks time tracking CLI",
         required_scopes: Auth::REQUIRED_SCOPES,
+        global_flags: {
+          "--no-interactive" => "Disable interactive prompts (auto-detected when not a TTY)",
+          "--format json" => "Output format: json (available on all commands)"
+        },
         commands: {
           auth: {
             description: "Authenticate with FreshBooks via OAuth2",
-            usage: "fb auth",
-            interactive: true
+            usage: "fb auth [SUBCOMMAND]",
+            interactive: "Interactive when no subcommand; subcommands are non-interactive",
+            subcommands: {
+              "setup" => "Save OAuth credentials: fb auth setup --client-id ID --client-secret SECRET",
+              "url" => "Print the OAuth authorization URL",
+              "callback" => "Exchange OAuth code: fb auth callback REDIRECT_URL",
+              "status" => "Show current auth state (config, tokens, business)"
+            },
+            flags: {
+              "--client-id" => "OAuth client ID (for setup subcommand)",
+              "--client-secret" => "OAuth client secret (for setup subcommand)"
+            }
+          },
+          business: {
+            description: "List or select a business",
+            usage: "fb business [--select ID]",
+            interactive: "Interactive with --select (no value); non-interactive with --select ID",
+            flags: {
+              "--select ID" => "Set active business by ID",
+              "--select" => "Interactive business picker (no value)"
+            }
           },
           log: {
-            description: "Log a time entry (interactive prompts with defaults from last use)",
+            description: "Log a time entry",
             usage: "fb log",
-            interactive: true,
+            interactive: "Prompts for missing fields when interactive; requires --duration and --note when non-interactive",
             flags: {
-              "--client" => "Pre-select client by name (skip prompt)",
-              "--project" => "Pre-select project by name (skip prompt)",
-              "--service" => "Pre-select service by name (skip prompt)",
-              "--duration" => "Duration in hours (e.g. 2.5)",
-              "--note" => "Work description",
-              "--date" => "Date (YYYY-MM-DD, defaults to today)",
+              "--client" => "Client name (required non-interactive if multiple clients, auto-selected if single)",
+              "--project" => "Project name (optional, auto-selected if single)",
+              "--service" => "Service name (optional)",
+              "--duration" => "Duration in hours, e.g. 2.5 (required non-interactive)",
+              "--note" => "Work description (required non-interactive)",
+              "--date" => "Date YYYY-MM-DD (defaults to today)",
               "--yes" => "Skip confirmation prompt"
             }
           },
@@ -336,16 +943,64 @@ module FB
               "--from" => "Start date (YYYY-MM-DD, open-ended if omitted)",
               "--to" => "End date (YYYY-MM-DD, open-ended if omitted)",
               "--month" => "Month (1-12, defaults to current)",
-              "--year" => "Year (defaults to current)",
-              "--format" => "Output format: table (default) or json"
+              "--year" => "Year (defaults to current)"
             }
           },
-          help: {
-            description: "Show help information",
-            usage: "fb help [COMMAND]",
+          clients: {
+            description: "List all clients",
+            usage: "fb clients"
+          },
+          projects: {
+            description: "List all projects",
+            usage: "fb projects",
+            flags: {
+              "--client" => "Filter by client name"
+            }
+          },
+          services: {
+            description: "List all services",
+            usage: "fb services"
+          },
+          status: {
+            description: "Show hours summary for today, this week, and this month",
+            usage: "fb status"
+          },
+          delete: {
+            description: "Delete a time entry",
+            usage: "fb delete --id ID --yes",
+            interactive: "Interactive picker when no --id; requires --id when non-interactive",
+            flags: {
+              "--id" => "Time entry ID (required non-interactive)",
+              "--yes" => "Skip confirmation prompt"
+            }
+          },
+          edit: {
+            description: "Edit a time entry",
+            usage: "fb edit --id ID [--duration H] [--note TEXT] --yes",
+            interactive: "Interactive picker and field editor when no --id; requires --id when non-interactive",
             flags: {
-              "--format" => "Output format: text (default) or json"
+              "--id" => "Time entry ID (required non-interactive)",
+              "--duration" => "New duration in hours",
+              "--note" => "New note",
+              "--date" => "New date (YYYY-MM-DD)",
+              "--client" => "New client name",
+              "--project" => "New project name",
+              "--service" => "New service name",
+              "--yes" => "Skip confirmation prompt"
+            }
+          },
+          cache: {
+            description: "Manage cached data",
+            usage: "fb cache [refresh|clear|status]",
+            subcommands: {
+              "refresh" => "Force-refresh all cached data",
+              "clear" => "Delete cache file",
+              "status" => "Show cache age and staleness"
             }
+          },
+          help: {
+            description: "Show help information",
+            usage: "fb help [COMMAND]"
           }
         }
       }

data/lib/fb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FB
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freshbooks-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - parasquid