openclacky 1.0.4 → 1.1.0

data/.clacky/skills/gem-release/scripts/release.sh

@@ -0,0 +1,304 @@
+#!/bin/bash
+# release.sh — openclacky gem release automation
+#
+# Usage:
+#   bash release.sh <version> [--prerelease] [--update-latest]
+#
+# Examples:
+#   bash release.sh 1.0.6                           # stable release
+#   bash release.sh 1.0.6 --dry-run                 # preview without executing
+#   bash release.sh 2.0.0.beta.1 --prerelease       # pre-release, skip latest.txt
+#   bash release.sh 2.0.0.rc1 --prerelease --update-latest  # pre-release, update latest.txt
+#
+# Prerequisites:
+#   - gh CLI installed and authenticated
+#   - coscli installed at /usr/local/bin/coscli with ~/.cos.yaml
+#   - RubyGems credentials configured (gem push)
+
+set -euo pipefail
+
+# ── Colors ──────────────────────────────────────────────────────────────
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+CYAN='\033[0;36m'
+NC='\033[0m'
+
+info()    { echo -e "${BLUE}ℹ${NC}  $1"; }
+success() { echo -e "${GREEN}✓${NC}  $1"; }
+warn()    { echo -e "${YELLOW}⚠${NC}  $1"; }
+error()   { echo -e "${RED}✗${NC}  $1" >&2; }
+step()    { echo -e "\n${CYAN}▶ Step $1:${NC} $2\n"; }
+die()     { error "$1"; exit 1; }
+
+# ── Parse args ──────────────────────────────────────────────────────────
+VERSION=""
+PRERELEASE=false
+UPDATE_LATEST=true
+DRY_RUN=false
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --prerelease)    PRERELEASE=true; UPDATE_LATEST=false ;;
+        --update-latest) UPDATE_LATEST=true ;;
+        --dry-run)       DRY_RUN=true ;;
+        --help|-h)
+            echo "Usage: bash release.sh <version> [--prerelease] [--update-latest] [--dry-run]"
+            exit 0
+            ;;
+        -*)              die "Unknown option: $1" ;;
+        *)               VERSION="$1" ;;
+    esac
+    shift
+done
+
+[[ -z "$VERSION" ]] && die "Version argument required. Usage: bash release.sh <version>"
+
+# ── Resolve paths ───────────────────────────────────────────────────────
+REPO_ROOT="$(git rev-parse --show-toplevel 2>/dev/null)" || die "Not inside a git repository"
+cd "$REPO_ROOT"
+
+VERSION_FILE="lib/clacky/version.rb"
+GEMSPEC="openclacky.gemspec"
+CHANGELOG="CHANGELOG.md"
+GEM_FILE="openclacky-${VERSION}.gem"
+OSS_BUCKET="cos://clackyai-1258723534"
+
+[[ -f "$VERSION_FILE" ]] || die "Version file not found: $VERSION_FILE"
+[[ -f "$GEMSPEC" ]]      || die "Gemspec not found: $GEMSPEC"
+
+CURRENT_VERSION=$(ruby -ne 'puts $1 if /VERSION\s*=\s*"([^"]+)"/' "$VERSION_FILE")
+info "Current version: ${CURRENT_VERSION}"
+info "Target version:  ${VERSION}"
+info "Pre-release:     ${PRERELEASE}"
+info "Update latest:   ${UPDATE_LATEST}"
+info "Dry run:         ${DRY_RUN}"
+echo ""
+
+if [[ "$DRY_RUN" == true ]]; then
+    warn "DRY RUN mode — no changes will be made"
+    echo ""
+fi
+
+# ── Helper: run or preview ──────────────────────────────────────────────
+run() {
+    if [[ "$DRY_RUN" == true ]]; then
+        echo -e "  ${YELLOW}[dry-run]${NC} $*"
+    else
+        "$@"
+    fi
+}
+
+# ════════════════════════════════════════════════════════════════════════
+# Step 1: Pre-release checks
+# ════════════════════════════════════════════════════════════════════════
+step 1 "Pre-release checks"
+
+if [[ -n "$(git status --porcelain)" ]]; then
+    die "Working directory is not clean. Commit or stash changes first."
+fi
+success "Working directory is clean"
+
+BRANCH=$(git branch --show-current)
+if [[ "$BRANCH" != "main" ]]; then
+    warn "Not on main branch (currently on '${BRANCH}')"
+fi
+
+command -v gh    >/dev/null 2>&1 || die "gh CLI not found. Install with: brew install gh"
+command -v coscli >/dev/null 2>&1 || die "coscli not found. Install at /usr/local/bin/coscli"
+success "Required tools available (gh, coscli)"
+
+# ════════════════════════════════════════════════════════════════════════
+# Step 2: Run tests
+# ════════════════════════════════════════════════════════════════════════
+step 2 "Running test suite"
+
+if [[ "$DRY_RUN" == true ]]; then
+    echo -e "  ${YELLOW}[dry-run]${NC} bundle exec rspec"
+else
+    bundle exec rspec || die "Tests failed — aborting release"
+fi
+success "All tests passed"
+
+# ════════════════════════════════════════════════════════════════════════
+# Step 3: Bump version
+# ════════════════════════════════════════════════════════════════════════
+step 3 "Bumping version to ${VERSION}"
+
+run sed -i '' "s/VERSION = \"${CURRENT_VERSION}\"/VERSION = \"${VERSION}\"/" "$VERSION_FILE"
+
+if [[ "$DRY_RUN" != true ]]; then
+    grep -q "VERSION = \"${VERSION}\"" "$VERSION_FILE" || die "Version bump failed"
+fi
+success "Updated ${VERSION_FILE}"
+
+# ════════════════════════════════════════════════════════════════════════
+# Step 4: Update Gemfile.lock
+# ════════════════════════════════════════════════════════════════════════
+step 4 "Updating Gemfile.lock"
+
+run bundle install --quiet
+success "Gemfile.lock updated"
+
+# ════════════════════════════════════════════════════════════════════════
+# Step 5: Commit version bump
+# ════════════════════════════════════════════════════════════════════════
+step 5 "Committing version bump"
+
+run git add "$VERSION_FILE" Gemfile.lock
+run git commit -m "chore: bump version to ${VERSION}"
+success "Version bump committed"
+
+# ════════════════════════════════════════════════════════════════════════
+# Step 6: Push and wait for CI
+# ════════════════════════════════════════════════════════════════════════
+step 6 "Pushing to origin and checking CI"
+
+run git push origin "$BRANCH"
+success "Pushed to origin/${BRANCH}"
+
+if [[ "$DRY_RUN" != true ]]; then
+    info "Waiting for CI to complete (this may take a few minutes)..."
+    if gh run list --branch "$BRANCH" --limit 1 --json status -q '.[0].status' 2>/dev/null | grep -q "completed"; then
+        success "CI already completed"
+    else
+        gh run watch --exit-status 2>/dev/null || warn "Could not watch CI run — verify manually at GitHub Actions"
+    fi
+fi
+
+# ════════════════════════════════════════════════════════════════════════
+# Step 7: Build gem
+# ════════════════════════════════════════════════════════════════════════
+step 7 "Building gem"
+
+run gem build "$GEMSPEC"
+
+if [[ "$DRY_RUN" != true ]]; then
+    [[ -f "$GEM_FILE" ]] || die "Gem file not found: $GEM_FILE"
+fi
+success "Built ${GEM_FILE}"
+
+# ════════════════════════════════════════════════════════════════════════
+# Step 8: Publish to RubyGems
+# ════════════════════════════════════════════════════════════════════════
+step 8 "Publishing to RubyGems"
+
+run gem push "$GEM_FILE"
+success "Published to RubyGems"
+
+# ════════════════════════════════════════════════════════════════════════
+# Step 9: Git tag
+# ════════════════════════════════════════════════════════════════════════
+step 9 "Creating git tag v${VERSION}"
+
+run git tag "v${VERSION}"
+run git push origin --tags
+success "Tag v${VERSION} pushed"
+
+# ════════════════════════════════════════════════════════════════════════
+# Step 10: GitHub Release
+# ════════════════════════════════════════════════════════════════════════
+step 10 "Creating GitHub Release"
+
+RELEASE_NOTES_FILE="/tmp/release_notes_${VERSION}.md"
+
+if [[ "$DRY_RUN" != true ]]; then
+    if [[ -f "$CHANGELOG" ]]; then
+        # Extract section for this version from CHANGELOG
+        awk "/^## \\[${VERSION}\\]/{found=1; next} /^## \\[/{if(found) exit} found{print}" "$CHANGELOG" > "$RELEASE_NOTES_FILE"
+        if [[ ! -s "$RELEASE_NOTES_FILE" ]]; then
+            echo "Release v${VERSION}" > "$RELEASE_NOTES_FILE"
+            warn "No CHANGELOG entry found for ${VERSION} — using placeholder"
+        fi
+    else
+        echo "Release v${VERSION}" > "$RELEASE_NOTES_FILE"
+        warn "CHANGELOG.md not found — using placeholder"
+    fi
+fi
+
+if [[ "$PRERELEASE" == true ]]; then
+    run gh release create "v${VERSION}" \
+        --title "v${VERSION}" \
+        --notes-file "$RELEASE_NOTES_FILE" \
+        --prerelease \
+        "$GEM_FILE"
+else
+    run gh release create "v${VERSION}" \
+        --title "v${VERSION}" \
+        --notes-file "$RELEASE_NOTES_FILE" \
+        --latest \
+        "$GEM_FILE"
+fi
+success "GitHub Release created"
+
+# ════════════════════════════════════════════════════════════════════════
+# Step 11: Upload to OSS CDN
+# ════════════════════════════════════════════════════════════════════════
+step 11 "Syncing to Tencent Cloud OSS"
+
+run coscli cp "$GEM_FILE" "${OSS_BUCKET}/openclacky/${GEM_FILE}"
+success "Uploaded ${GEM_FILE} to OSS"
+
+if [[ "$UPDATE_LATEST" == true ]]; then
+    if [[ "$DRY_RUN" != true ]]; then
+        echo "${VERSION}" > /tmp/latest.txt
+    fi
+    run coscli cp /tmp/latest.txt "${OSS_BUCKET}/openclacky/latest.txt"
+    success "Updated latest.txt → ${VERSION}"
+
+    if [[ "$DRY_RUN" != true ]]; then
+        VERIFY=$(curl -fsSL https://oss.1024code.com/openclacky/latest.txt 2>/dev/null || echo "FAILED")
+        if [[ "$VERIFY" == "$VERSION" ]]; then
+            success "Verified latest.txt = ${VERSION}"
+        else
+            warn "latest.txt verification returned: ${VERIFY}"
+        fi
+    fi
+else
+    info "Skipping latest.txt update (pre-release or not requested)"
+fi
+
+# ════════════════════════════════════════════════════════════════════════
+# Step 12: Sync scripts to OSS
+# ════════════════════════════════════════════════════════════════════════
+step 12 "Rebuilding and syncing scripts to OSS"
+
+run bash scripts/build/build.sh
+
+if [[ "$DRY_RUN" != true ]]; then
+    for script in scripts/*.sh scripts/*.ps1; do
+        [[ -f "$script" ]] || continue
+        coscli cp "$script" "${OSS_BUCKET}/clacky-ai/openclacky/main/scripts/$(basename "$script")"
+        success "Uploaded $(basename "$script")"
+    done
+else
+    echo -e "  ${YELLOW}[dry-run]${NC} Upload scripts/*.sh and scripts/*.ps1 to OSS"
+fi
+success "Scripts synced to OSS"
+
+# ════════════════════════════════════════════════════════════════════════
+# Step 13: Cleanup
+# ════════════════════════════════════════════════════════════════════════
+step 13 "Cleanup"
+
+[[ -f "$GEM_FILE" ]] && rm -f "$GEM_FILE" && info "Removed ${GEM_FILE}"
+[[ -f "$RELEASE_NOTES_FILE" ]] && rm -f "$RELEASE_NOTES_FILE"
+[[ -f "/tmp/latest.txt" ]] && rm -f /tmp/latest.txt
+
+# ════════════════════════════════════════════════════════════════════════
+# Done
+# ════════════════════════════════════════════════════════════════════════
+echo ""
+echo "╔═══════════════════════════════════════════════════════════╗"
+echo "║                                                           ║"
+echo -e "║   ${GREEN}🎉  v${VERSION} released successfully!${NC}                     ║"
+echo "║                                                           ║"
+echo "╠═══════════════════════════════════════════════════════════╣"
+echo "║                                                           ║"
+echo "║  📦 RubyGems:  rubygems.org/gems/openclacky              ║"
+echo "║  🏷️  GitHub:    github.com/clacky-ai/openclacky/releases  ║"
+echo "║  ☁️  OSS CDN:   oss.1024code.com/openclacky/              ║"
+echo "║                                                           ║"
+echo "╚═══════════════════════════════════════════════════════════╝"
+echo ""

data/CHANGELOG.md

@@ -5,6 +5,48 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.0] - 2026-05-15
+
+### Added
+- **DingTalk channel adapter.** New IM channel adapter connects openclacky to DingTalk via Stream Mode WebSocket. Includes DingTalk API client for text/markdown messages, Device Flow QR setup script, and full Web UI integration with channel config, HTTP server routes, and i18n strings. (#112)
+- **Feishu channel-manager skill setup & onboard improvements.** Channel-manager now includes a dedicated Feishu skills installation flow (`install_feishu_skills.rb`) and updated setup instructions. Skill installation is serialized for reliability. (#122)
+- **Custom datepicker component with i18n support.** New reusable datepicker component with CSS variable theming and full English/Chinese localization, replacing browser-native date inputs. (#119)
+- **Rename sessions via modal dialog.** Session rename now uses a proper modal dialog with i18n support instead of inline editing, for a cleaner UX. (#113)
+- **Channel enable/disable toggle.** Configured channels can now be individually enabled or disabled from the Channels page without removing credentials. Distinguishes "disabled" from "not configured" in badge and hint text. (#108)
+- **Provider promo hint for OpenClacky.** When OpenClacky is selected as provider, a contextual promo hint appears below the dropdown on both settings and onboarding pages, with dark mode support and localized copy. (#109)
+- **Running config for concurrent agent limits.** New `AgentConfig` running configuration and `SessionRegistry` concurrency controls to limit the number of simultaneously active agents, preventing resource exhaustion on busy servers.
+
+### Improved
+- **Channel page and sidebar nav polish.** Visual refinements to the Channels page layout and sidebar navigation styling.
+- **Telegram group chat skill guidance.** Channel-setup skill now clarifies Privacy Mode requirements for Telegram group chats, preventing common misconfiguration. (#117)
+
+### Fixed
+- **Channel skill trigger matching.** Renamed `channel-setup` to `channel-manager` so the agent's send-message intent matches the correct skill more reliably. (C-5584, #120)
+- **Markdown image overflow in chat bubbles.** Images in assistant messages are now width-constrained to fit within the message bubble instead of overflowing. (C-5585, #118)
+- **Channel image rewriting scoped to Web UI.** Local image URL rewriting is now applied only in the Web UI context; IM channel messages use the file basename as attachment name instead. (C-5590, #115)
+- **Discord file upload.** Added multipart middleware to the Discord Faraday connection so file attachments upload correctly. (C-5589, #116)
+- **File walk respects ignore patterns.** Fixed glob/walk to apply ignore patterns before traversal, resolving cases where ignored files were still visited. (#102)
+- **Server restart kills stale PIDs.** Improved process cleanup on restart with better PID management and user-facing hints when restart fails.
+- **Device ID persistence.** Device ID is now persisted in `BrandConfig` instead of being regenerated, ensuring stable telemetry identity across restarts.
+- **Terminal markdown rendering on Ruby 4.0.** Fixed compatibility issue with Ruby 4.0's stricter method dispatch that broke terminal markdown output. (#99)
+
+## [1.0.5] - 2026-05-12
+
+### Added
+- **Telegram channel adapter.** New IM channel adapter that connects openclacky to Telegram via the Bot API. Setup is just a bot token from @BotFather — no browser automation, no QR. Mirrors the existing Feishu / WeCom / Weixin contract: HTTPS long-poll inbound, `sendMessage` / `sendPhoto` / `sendDocument` outbound, photo + document download routed through the standard FileProcessor + vision pipeline, group `@-mention` filtering and `allowed_users` whitelist. `base_url` is configurable to support self-hosted Bot API servers (https://github.com/tdlib/telegram-bot-api) for networks where `api.telegram.org` is unreachable. Frontend Channels panel, `channel-setup` skill, English/Chinese i18n, and `app.css` logo class added. 32 new specs in `spec/clacky/server/channel/adapters/telegram/`.
+- **Discord channel adapter.** Full Discord integration via REST API + Gateway (WebSocket), with channel-setup support, Web UI Channels panel entry, and i18n strings. Connect Clacky to Discord servers for bot interactions through slash commands and message events.
+- **OpenRouter curated model list.** The OpenRouter provider now ships with a curated dropdown of mainstream Claude and GPT models (Sonnet, Opus, Haiku, GPT-5.5/5.4), so users can pick from the list instead of typing model IDs manually. Full catalogue still accessible by typing any model ID.
+- **OpenRouter lite model pairing.** Subagents on OpenRouter now automatically get a sensible cheap/fast sidekick — Claude family pairs with Haiku, GPT family pairs with the mini variant — matching the behavior already available on the native OpenAI and OpenClacky providers.
+- **MiMo 2.5 Pro (Xiaomi) model support.** Added `mimo-v2.5-pro` to the MiMo provider preset alongside existing MiMo models.
+- **AI key setup guide link.** New users and those configuring API keys now see a "New to AI keys? See the guide →" link on both onboarding and settings pages, pointing to the official documentation.
+
+### Improved
+- **Default model upgraded to claude-sonnet-4-6.** The OpenClacky provider now defaults to the latest Claude Sonnet model for better performance out of the box.
+
+### Fixed
+- **Linux server restart stability.** Fixed an inherited socket cleanup bug where WEBrick's shutdown would propagate `SHUT_RDWR` to the shared kernel socket, breaking subsequent `accept()` calls on Linux. The server now detaches inherited sockets before shutdown so worker restarts work reliably.
+- **Upgrade failure recovery UI.** When an in-app upgrade restart fails, the UI now shows both tray icon and CLI recovery paths (`gem update ...`) instead of leaving users stranded. Also added branded CLI command info to the version check API for white-label builds.
+
 ## [1.0.4] - 2026-05-11
 
 ### Added

data/docs/system-skill-authoring-guide.md

@@ -23,7 +23,7 @@ Skills must not read local config files directly.
 - ❌ `cat ~/.clacky/browser.yml`
 - ✅ `curl http://${CLACKY_SERVER_HOST}:${CLACKY_SERVER_PORT}/api/browser/status`
 
-Exception: lightweight `enable` / `disable` operations may read/write yml directly (see `channel-setup`).
+Exception: lightweight `enable` / `disable` operations may read/write yml directly (see `channel-manager`).
 
 ---
 

data/lib/clacky/agent/tool_executor.rb

@@ -178,6 +178,9 @@ module Clacky
         if formatted_result.is_a?(Hash) && formatted_result[:image_inject]
           image_inject = formatted_result[:image_inject]
           formatted_result = formatted_result.reject { |k, _| k == :image_inject }
+          if formatted_result[:content_string]
+            formatted_result = formatted_result[:content_string]
+          end
         end
 
         # If the tool returned a plain string, use it directly (avoids double-escaping).
@@ -187,7 +190,6 @@ module Clacky
         content = if formatted_result.is_a?(String)
                     formatted_result
                   elsif formatted_result.is_a?(Array)
-                    # Multipart content (e.g. screenshot image blocks) — keep as Array
                     formatted_result
                   else
                     JSON.generate(formatted_result)

data/lib/clacky/agent.rb

@@ -979,9 +979,12 @@ module Clacky
         next unless mime_type && base64_data
 
         data_url = "data:#{mime_type};base64,#{base64_data}"
+        label = path ? File.basename(path.to_s) : "image"
+        image_block = { type: "image_url", image_url: { url: data_url } }
+        image_block[:image_path] = path if path
         image_content = [
-          { type: "text",      text: "[Image from file_reader: #{File.basename(path.to_s)}]" },
-          { type: "image_url", image_url: { url: data_url } }
+          { type: "text", text: "[Image: #{label}]" },
+          image_block
         ]
         @history.append({
           role:             "user",
@@ -1514,7 +1517,7 @@ module Clacky
         inline = $1 == "!"
         # URL-decode percent-encoded characters (e.g. Chinese filenames encoded by AI)
         raw_path = CGI.unescape($3)
-        name   = $2.empty? ? File.basename(raw_path) : $2
+        name   = File.basename(raw_path)
         path   = File.expand_path(raw_path)
         Clacky::Logger.info("[parse_file_links] raw=#{$3.inspect} expanded=#{path.inspect} exist=#{File.exist?(path)}")
         files << { name: name, path: path, inline: inline }
@@ -1523,13 +1526,15 @@ module Clacky
     end
 
     # Emit assistant message to UI, parsing any embedded file:// links first.
+    #
+    # Local image URL rewriting (file:// → /api/local-image) is intentionally
+    # NOT done here. It is browser-specific (the Web UI runs on http://localhost
+    # and cannot load file:// directly) and must stay scoped to the Web UI
+    # controller. IM channel subscribers need the original file:// markdown so
+    # parse_file_links can extract paths and deliver images as native attachments.
     private def emit_assistant_message(content)
       return if content.nil? || content.empty?
 
-      # Rewrite local image paths (file:// and bare absolute) to /api/local-image proxy URLs
-      # so the browser can render them without file:// security blocks.
-      content = Clacky::Utils::FileProcessor.rewrite_local_image_urls(content)
-
       parsed = parse_file_links(content)
       @ui&.show_assistant_message(parsed[:text], files: parsed[:files])
     end

data/lib/clacky/agent_config.rb

@@ -154,7 +154,8 @@ module Clacky
     attr_accessor :permission_mode, :max_tokens, :verbose,
                   :enable_compression, :enable_prompt_caching,
                   :models, :current_model_index, :current_model_id,
-                  :memory_update_enabled, :skill_evolution
+                  :memory_update_enabled, :skill_evolution,
+                  :max_running_agents, :max_idle_agents
 
     def initialize(options = {})
       @permission_mode = validate_permission_mode(options[:permission_mode])
@@ -195,6 +196,9 @@ module Clacky
       @skill_evolution = @skill_evolution.transform_keys(&:to_sym)
       @skill_evolution.transform_values! { |v| v.is_a?(Hash) ? v.transform_keys(&:to_sym) : v }
 
+      @max_running_agents = options[:max_running_agents] || 10
+      @max_idle_agents = options[:max_idle_agents] || 10
+
       # Per-session virtual model overlay.
       # When set, #current_model returns a *merged* hash (the resolved @models
       # entry merged with this overlay) without mutating the shared @models
@@ -368,7 +372,7 @@ module Clacky
     # These map directly to AgentConfig accessors.
     CONFIG_SETTINGS_KEYS = %w[
       enable_compression enable_prompt_caching memory_update_enabled
-      skill_evolution
+      skill_evolution max_running_agents max_idle_agents
     ].freeze
 
     # Serialize the current agent configuration to YAML.
@@ -382,7 +386,9 @@ module Clacky
         "enable_compression" => @enable_compression,
         "enable_prompt_caching" => @enable_prompt_caching,
         "memory_update_enabled" => @memory_update_enabled,
-        "skill_evolution" => @skill_evolution
+        "skill_evolution" => @skill_evolution,
+        "max_running_agents" => @max_running_agents,
+        "max_idle_agents" => @max_idle_agents
       }
       YAML.dump("settings" => settings, "models" => persistable_models)
     end

data/lib/clacky/brand_config.rb

@@ -76,13 +76,28 @@ module Clacky
 
     # Load brand configuration from ~/.clacky/brand.yml.
     # Returns an empty BrandConfig (no brand) if the file does not exist.
+    # Always ensures a stable device_id is present and persisted.
     def self.load
-      return new({}) unless File.exist?(BRAND_FILE)
+      if File.exist?(BRAND_FILE)
+        data = YAML.safe_load(File.read(BRAND_FILE)) || {}
+      else
+        data = {}
+      end
 
-      data = YAML.safe_load(File.read(BRAND_FILE)) || {}
-      new(data)
+      instance = new(data)
+      instance.ensure_device_id!
+      instance
     rescue StandardError
-      new({})
+      instance = new({})
+      instance.ensure_device_id!
+      instance
+    end
+
+    def ensure_device_id!
+      return if @device_id && !@device_id.strip.empty?
+
+      @device_id = generate_device_id
+      save
     end
 
     # Returns true when this installation has a product name configured.

data/lib/clacky/cli.rb

@@ -172,7 +172,7 @@ module Clacky
       # is booted by this process), and only when the user hasn't already set
       # CLACKY_SERVER_HOST / CLACKY_SERVER_PORT explicitly.
       #
-      # Why: skills like `channel-setup` and `browser-setup` call back into
+      # Why: skills like `channel-manager` and `browser-setup` call back into
       # http://${CLACKY_SERVER_HOST}:${CLACKY_SERVER_PORT}/api/*. In server
       # mode those vars are injected by HTTPServer#start. In CLI mode they
       # would be blank, so the skill templates expand to an unreachable URL.