feat: optimize vibe module

Vonng · Vonng · commit d07e2f4d4b3f · 2026-01-30T16:38:10.000+08:00
diff --git a/Makefile b/Makefile
@@ -166,6 +166,9 @@ repo-clean:
 node-repo:
 	./node.yml -t node_repo
 
+node-pkg:
+	./node.yml -t node_pkg
+
 node-upstream:
 	./node.yml -t node_repo -e node_repo_modules=node,pgsql,infra,local
 
@@ -196,6 +199,10 @@ docker:
 app:
 	./app.yml
 
+# claude
+claude:
+	./vibe.yml -t nodejs,claude
+
 # install & uninstall pgsql (dangerous!!)
 pgsql-add:
 	./infra.yml -t repo_build
@@ -661,8 +668,8 @@ rs:
         src \
         c v validate \
         infra repo repo-upstream repo-check repo-build repo-add repo-clean \
-        node-repo node-upstream redeploy \
-        grafana vv vlogs vector nginx cert docker app \
+        node-repo node-upstream node-pkg redeploy \
+        grafana vv vlogs vector nginx cert claude cc docker app \
         pgsql-add pgsql-rm pgsql-ext \
         deps dns start ssh tssh \
         up dw del nuke new clean \
diff --git a/conf/docker.yml b/conf/docker.yml
@@ -53,7 +53,7 @@ all:
     node_kernel_modules: []
     node_repo_remove: true
     node_repo_modules: 'node,infra,pgsql'
-    #node_packages: [ openssh-server ]
+
 
     #----------------------------------------------#
     # PGSQL: https://pigsty.io/docs/pgsql
@@ -91,14 +91,14 @@ all:
     #----------------------------------------------#
     #code_password: DBUser.Meta
     #jupyter_password: DBUser.Meta
-    #
     #juice_instances:  # dict of juicefs filesystems to deploy
     #  jfs:
     #    path  : /fs
     #    meta  : postgres://dbuser_meta:DBUser.Meta@10.10.10.10:5432/meta
     #    data  : --storage postgres --bucket 10.10.10.10:5432/meta --access-key dbuser_meta --secret-key DBUser.Meta
     #    port  : 9567
-    #
+    #node_packages: [ openssh-server, tumx, juicefs, restic, rclone, uv, code-server ]
+    #npm_packages: [ '@anthropic-ai/claude-code' , 'happy-coder' ]
     #claude_env:
     #  ANTHROPIC_BASE_URL: https://open.bigmodel.cn/api/anthropic
     #  ANTHROPIC_API_URL: https://open.bigmodel.cn/api/anthropic
diff --git a/conf/vibe.yml b/conf/vibe.yml
@@ -57,7 +57,7 @@ all:
     node_tune: oltp                     # node tuning specs: oltp,olap,tiny,crit
     node_dns_method: none               # do not setup dns
     node_repo_modules: node,infra,pgsql # add these repos directly to the singleton node
-    node_packages: [ openssh-server, juicefs, restic, rclone, uv, opencode, claude, code-server, golang, asciinema, genai-toolbox, postgrest ]
+    node_packages: [ openssh-server, juicefs, restic, rclone, uv, opencode, code-server, golang, asciinema, tmux ]
     docker_enabled: true                # enable docker service
     node_firewall_mode: none            # change to 'zone' to enable firewall
     node_firewall_public_port: [22, 80, 443, 5432]    # add custom public ports
@@ -109,6 +109,8 @@ all:
         meta  : postgres://dbuser_meta:DBUser.Meta@10.10.10.10:5432/meta
         data  : --storage postgres --bucket 10.10.10.10:5432/meta --access-key dbuser_meta --secret-key DBUser.Meta
         port  : 9567
+
+    npm_packages: [ '@anthropic-ai/claude-code' , 'happy-coder' ]
     #claude_env:
     #  ANTHROPIC_BASE_URL: https://open.bigmodel.cn/api/anthropic
     #  ANTHROPIC_API_URL: https://open.bigmodel.cn/api/anthropic
diff --git a/files/cmdb.sql b/files/cmdb.sql
@@ -1657,4 +1657,5 @@ INSERT INTO pigsty.default_var VALUES
 (1030, 'claude_enabled', 'true', 'VIBE', 'CLAUDE', 'bool', 'C', 'enable claude code configuration', NULL),
 (1031, 'claude_env', '{}', 'VIBE', 'CLAUDE', 'dict', 'C', 'extra env vars to merge with defaults', NULL),
 (1040, 'nodejs_enabled', 'true', 'VIBE', 'NODEJS', 'bool', 'C', 'enable nodejs installation', NULL),
-(1041, 'nodejs_registry', '""', 'VIBE', 'NODEJS', 'url', 'C', 'npm registry, auto china mirror if empty', NULL);
+(1041, 'nodejs_registry', '""', 'VIBE', 'NODEJS', 'url', 'C', 'npm registry, auto china mirror if empty', NULL),
+(1042, 'npm_packages', '[]', 'VIBE', 'NODEJS', 'string[]', 'C', 'list of global npm packages to install', NULL);
diff --git a/files/grafana/node/claude-code.json b/files/grafana/node/claude-code.json
@@ -1,12 +1,10 @@
 {
   "annotations":{"list":[{"builtIn":1,"datasource":{"type":"grafana","uid":"-- Grafana --"},"enable":true,"hide":true,"iconColor":"#BF6C50","name":"Annotations & Alerts","type":"dashboard"}]},
-  "author":"Ruohang Feng (rh@vonng.com)",
   "description":"Claude Code Observability",
   "editable":true,
   "fiscalYearStartMonth":0,
   "graphTooltip":1,
   "id":null,
-  "license":"https://pigsty.io/docs/about/license/",
   "links":[],
   "panels":[
     {"collapsed":false,"gridPos":{"h":1,"w":24,"x":0,"y":0},"id":1,"panels":[],"title":"Overview","type":"row"},
@@ -36,10 +34,8 @@
         "defaults":{"color":{"mode":"thresholds"},"custom":{"align":"center","cellOptions":{"type":"auto"},"footer":{"reducers":[]},"inspect":true},"mappings":[],"thresholds":{"mode":"absolute","steps":[{"color":"text","value":0}]}},
         "overrides":[
           {"matcher":{"id":"byName","options":"duration_ms"},"properties":[{"id":"unit","value":"ms"},{"id":"custom.width","value":100},{"id":"custom.cellOptions","value":{"mode":"gradient","type":"color-background"}},{"id":"thresholds","value":{"mode":"absolute","steps":[{"color":"#5B8C7A","value":0},{"color":"#C9A257","value":2000},{"color":"#C45B47","value":5000}]}}]},
-          {"matcher":{"id":"byName","options":"session.id"},"properties":[{"id":"custom.width","value":300},{"id":"links","value":[{"title":"Claude Code : ${__data.fields.SessionID}","url":"/d/claude-code?var-session=${__data.fields.SessionID}&${__url_time_range}"}]}]},{"matcher":{"id":"byName","options":"Time"},"properties":[{"id":"custom.width","value":160},{"id":"unit","value":"s"}]},
-          {"matcher":{"id":"byName","options":"user.id"},"properties":[{"id":"custom.width","value":550}]},{"matcher":{"id":"byName","options":"scope.name"},"properties":[{"id":"custom.width","value":255}]},{"matcher":{"id":"byName","options":"scope.version"},"properties":[{"id":"custom.width","value":110}]},
-          {"matcher":{"id":"byName","options":"service.name"},"properties":[{"id":"custom.width","value":110}]},{"matcher":{"id":"byName","options":"service.version"},"properties":[{"id":"custom.width","value":120}]},{"matcher":{"id":"byName","options":"os.type"},"properties":[{"id":"custom.width","value":70}]},
-          {"matcher":{"id":"byName","options":"os.version"},"properties":[{"id":"custom.width","value":220}]},{"matcher":{"id":"byName","options":"host.arch"},"properties":[{"id":"custom.width","value":80}]},{"matcher":{"id":"byName","options":"terminal.type"},"properties":[{"id":"custom.width","value":133}]},
+          {"matcher":{"id":"byName","options":"SessionID"},"properties":[{"id":"custom.width","value":308},{"id":"links","value":[{"title":"Claude Code : ${__data.fields.SessionID}","url":"/d/claude-code?var-session=${__data.fields.SessionID}&${__url_time_range}"}]}]},{"matcher":{"id":"byName","options":"service.version"},"properties":[{"id":"custom.width","value":120}]},
+          {"matcher":{"id":"byName","options":"os.type"},"properties":[{"id":"custom.width","value":70}]},{"matcher":{"id":"byName","options":"os.version"},"properties":[{"id":"custom.width","value":220}]},{"matcher":{"id":"byName","options":"host.arch"},"properties":[{"id":"custom.width","value":80}]},{"matcher":{"id":"byName","options":"terminal.type"},"properties":[{"id":"custom.width","value":133}]},
           {
             "matcher":{"id":"byName","options":"event.name"},
             "properties":[{"id":"custom.width","value":100},{"id":"custom.align","value":"center"},{"id":"mappings","value":[{"options":{"api_request":{"color":"#f79f64","index":1},"tool_decision":{"color":"#5b9cd5","index":3},"tool_result":{"color":"#346f36cc","index":2},"user_prompt":{"color":"#3e668f","index":0}},"type":"value"}]},{"id":"custom.cellOptions","value":{"type":"color-background"}}]
@@ -51,7 +47,7 @@
           {"matcher":{"id":"byName","options":"success"},"properties":[{"id":"custom.width","value":80}]},{"matcher":{"id":"byName","options":"tool_name"},"properties":[{"id":"custom.width","value":100}]},{"matcher":{"id":"byName","options":"tool_parameters"},"properties":[{"id":"custom.align","value":"left"},{"id":"custom.minWidth","value":200},{"id":"custom.cellOptions","value":{"type":"json-view"}}]},
           {"matcher":{"id":"byName","options":"tool_result_size_bytes"},"properties":[{"id":"custom.width","value":180}]},{"matcher":{"id":"byName","options":"decision"},"properties":[{"id":"custom.width","value":90}]},{"matcher":{"id":"byName","options":"source"},"properties":[{"id":"custom.width","value":70}]},{"matcher":{"id":"byName","options":"use_id"},"properties":[{"id":"custom.width","value":250}]},
           {"matcher":{"id":"byName","options":"Logs"},"properties":[{"id":"custom.width","value":100}]},{"matcher":{"id":"byName","options":"IP"},"properties":[{"id":"custom.width","value":120},{"id":"links","value":[{"title":"Node Instance : ${__data.fields.IP}","url":"/d/node-instance?var-id=${__data.fields.IP}&{__url_time_range}"}]}]},
-          {"matcher":{"id":"byName","options":"First Seen"},"properties":[{"id":"custom.width","value":160}]},{"matcher":{"id":"byName","options":"Last Seen"},"properties":[{"id":"custom.width","value":160}]},{"matcher":{"id":"byName","options":"UserID"},"properties":[{"id":"custom.width","value":139}]}
+          {"matcher":{"id":"byName","options":"First Seen"},"properties":[{"id":"custom.width","value":160}]},{"matcher":{"id":"byName","options":"Last Seen"},"properties":[{"id":"custom.width","value":160}]},{"matcher":{"id":"byName","options":"UserID"},"properties":[{"id":"custom.width","value":120}]}
         ]
       },
       "gridPos":{"h":6,"w":18,"x":6,"y":1},
@@ -263,7 +259,7 @@
           {
             "matcher":{"id":"byName","options":"Model"},
             "properties":[
-              { "id":"custom.width"      ,"value":150                                                                                                                                                                                                                                                                                                                            },
+              { "id":"custom.width"      ,"value":200                                                                                                                                                                                                                                                                                                                            },
               { "id":"custom.cellOptions","value":{"type":"color-text"}                                                                                                                                                                                                                                                                                                          },
               { "id":"custom.align"      ,"value":"left"                                                                                                                                                                                                                                                                                                                         },
               { "id":"mappings"          ,"value":[{"options":{"pattern":"claude-opus.*|glm-4.7.*","result":{"color":"#f79f64","index":0}},"type":"regex"},{"options":{"pattern":"claude-sonnet.*|glm-4.6.*","result":{"color":"#346f36cc","index":1}},"type":"regex"},{"options":{"pattern":"claude-haiku.*|glm-4.5.*","result":{"color":"#5b9cd5","index":2}},"type":"regex"}] },
@@ -1031,7 +1027,8 @@
               { "id":"custom.cellOptions","value":{"type":"color-text"}                                                                                                                                                                                                                                                                                                          },
               { "id":"custom.align"      ,"value":"left"                                                                                                                                                                                                                                                                                                                         },
               { "id":"mappings"          ,"value":[{"options":{"pattern":"claude-opus.*|glm-4.7.*","result":{"color":"#f79f64","index":0}},"type":"regex"},{"options":{"pattern":"claude-sonnet.*|glm-4.6.*","result":{"color":"#346f36cc","index":1}},"type":"regex"},{"options":{"pattern":"claude-haiku.*|glm-4.5.*","result":{"color":"#5b9cd5","index":2}},"type":"regex"}] },
-              { "id":"custom.cellOptions","value":{"type":"pill"}                                                                                                                                                                                                                                                                                                                }
+              { "id":"custom.cellOptions","value":{"type":"pill"}                                                                                                                                                                                                                                                                                                                },
+              { "id":"custom.minWidth"   ,"value":160                                                                                                                                                                                                                                                                                                                            }
             ]
           },{
             "matcher":{"id":"byName","options":"Elapse"},
@@ -1913,5 +1910,7 @@
   "title":"Claude Code",
   "uid":"claude-code",
   "version":1,
-  "weekStart":""
+  "weekStart":"",
+  "author":"Ruohang Feng (rh@vonng.com)",
+  "license":"https://pigsty.io/docs/about/license/"
 }
diff --git a/files/grafana/pgsql/pgsql-xacts.json b/files/grafana/pgsql/pgsql-xacts.json
@@ -343,7 +343,6 @@
             "axisColorMode":"text",
             "axisLabel":"",
             "axisPlacement":"auto",
-            "axisSoftMax":1,
             "axisSoftMin":0,
             "barAlignment":0,
             "barWidthFactor":0.6,
diff --git a/roles/vibe/README.md b/roles/vibe/README.md
@@ -57,7 +57,8 @@ vibe
 │   └── claude_config
 └── nodejs            # Node.js Runtime
     ├── nodejs_install
-    └── nodejs_config
+    ├── nodejs_config
+    └── nodejs_pkg
 ```
 
 
@@ -104,9 +105,19 @@ Claude Code is pre-configured with OpenTelemetry, sending metrics and logs to Vi
 |-------------------|---------|--------------------------------------------------|
 | `nodejs_enabled`  | `true`  | Enable Node.js installation                      |
 | `nodejs_registry` | `''`    | npm registry URL, auto china mirror if empty     |
+| `npm_packages`    | `[]`    | List of global npm packages to install           |
 
 When `nodejs_registry` is empty and `region=china`, npm is automatically configured to use `https://registry.npmmirror.com`.
 
+Use `npm_packages` to install global npm packages like `@anthropic-ai/claude-code`:
+
+```yaml
+npm_packages:
+  - '@anthropic-ai/claude-code'
+  - typescript
+  - pnpm
+```
+
 
 ## Usage
 
diff --git a/roles/vibe/defaults/main.yml b/roles/vibe/defaults/main.yml
@@ -42,5 +42,5 @@ claude_env: {}                    # extra env vars to merge with defaults
 #--------------------------------------------------------------#
 nodejs_enabled: true              # enable nodejs installation
 nodejs_registry: ''               # npm registry, auto china mirror if empty
-
+npm_packages: []               # list of global npm packages to install
 ...
diff --git a/roles/vibe/tasks/claude.yml b/roles/vibe/tasks/claude.yml
@@ -4,12 +4,17 @@
 #--------------------------------------------------------------#
 
 #--------------------------------------------------------------#
-# claude_install - install claude package
+# claude_install - install claude-code via npm
 #--------------------------------------------------------------#
-- name: install claude package
-  tags: claude_install
-  package: name=claude state=present
-  environment: "{{ proxy_env | default({}) }}"
+# now installed via npm_packages
+#- name: install claude-code via npm
+#  tags: claude_install
+#  community.general.npm:
+#    name: "@anthropic-ai/claude-code"
+#    global: true
+#    state: present
+#  environment: "{{ proxy_env | default({}) }}"
+
 
 #--------------------------------------------------------------#
 # claude_config - create claude configuration directory
diff --git a/roles/vibe/tasks/nodejs.yml b/roles/vibe/tasks/nodejs.yml
@@ -4,14 +4,14 @@
 #--------------------------------------------------------------#
 
 #--------------------------------------------------------------#
-# nodejs_install - install nodejs package
+# nodejs_install - install nodejs package       [nodejs_install]
 #--------------------------------------------------------------#
 - name: install nodejs package
   tags: nodejs_install
   package: name=nodejs state=present
 
 #--------------------------------------------------------------#
-# nodejs_config - configure npm registry
+# nodejs_config - configure npm registry         [nodejs_config]
 #--------------------------------------------------------------#
 - name: configure npm registry
   tags: nodejs_config
@@ -30,4 +30,16 @@
         content: |
           registry={{ nodejs_registry | default('https://registry.npmmirror.com', true) }}
 
+#--------------------------------------------------------------#
+# npm_packages - install global npm packages           [npm_pkg]
+#--------------------------------------------------------------#
+- name: install global npm packages
+  tags: nodejs_pkg
+  when: npm_packages | default([]) | length > 0
+  shell: npm install -g {{ item }}
+  args:
+    executable: /bin/bash
+  loop: "{{ npm_packages }}"
+  environment: "{{ proxy_env | default({}) | combine({'PATH': '/usr/local/node/bin:/usr/local/bin:/usr/bin:/bin'}) }}"
+
 ...
diff --git a/vibe.yml b/vibe.yml
@@ -4,7 +4,7 @@
 # File      :   vibe.yml
 # Desc      :   Deploy development tools (claude, code, jupyter)
 # Ctime     :   2025-01-24
-# Mtime     :   2025-01-27
+# Mtime     :   2025-01-30
 # Path      :   vibe.yml
 # Docs      :   https://pigsty.io/docs/vibe
 # License   :   Apache-2.0 @ https://pigsty.io/docs/about/license/
@@ -30,6 +30,7 @@
     #claude_env: {}                    # extra env vars to merge with defaults
     #nodejs_enabled: true              # enable nodejs installation
     #nodejs_registry: ''               # npm registry, auto china mirror if empty
+    #npm_packages: []                  # list of global npm packages to install
   roles:
     - { role: node_id, tags: id   }
     - { role: vibe,    tags: vibe }
@@ -72,6 +73,7 @@
 #   - nodejs           : install nodejs runtime
 #     - nodejs_install : install nodejs package
 #     - nodejs_config  : configure npm registry
+#     - npm_pkg        : install global npm packages
 #   - claude           : configure claude code cli
 #     - claude_install : install claude-code package
 #     - claude_config  : render ~/.claude config files
