cc-pets 0.2.3 → 0.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -90,19 +90,32 @@ Claude Code Hook 会合并到 `~/.claude/settings.json`,现有的 `env`、`mod
90
90
  ### npm 安装
91
91
 
92
92
  ```bash
93
- npm install -g cc-pets@latest
93
+ npm install -g cc-pets@latest \
94
+ --allow-scripts=cc-pets \
95
+ --prefer-online
94
96
  # 首次安装后新开一个终端
95
97
  codex
96
98
  # 或
97
99
  claude
98
100
  ```
99
101
 
102
+ `--allow-scripts=cc-pets` 用于允许新版 npm 执行 CC Pets 的 `postinstall`,完成原生应用构建、
103
+ Hooks、shell alias 和 `~/Applications/CC Pets.app` 的安装;`--prefer-online` 会优先向 npm Registry
104
+ 检查 `latest`,减少刚发布新版本时命中旧元数据缓存的概率。
105
+
106
+ 如果已经只执行了 `npm install -g cc-pets@latest`,并看到 npm 提示安装脚本尚未获准,
107
+ 可以在包安装完成后手动初始化:
108
+
109
+ ```bash
110
+ cc-pets install
111
+ ```
112
+
100
113
  ### 本地源码安装
101
114
 
102
115
  ```bash
103
116
  git clone https://gitee.com/wangxinyusqn/cc-pets.git
104
117
  cd cc-pets
105
- npm install -g .
118
+ npm install -g . --allow-scripts=cc-pets
106
119
  # 首次安装后新开一个终端
107
120
  codex
108
121
  # 或
@@ -112,13 +125,17 @@ claude
112
125
  两种方式都会安装 `cc-pets`、`codex-with-pet` 和 `claude-with-pet`。
113
126
  npm 的安装后脚本会自动构建原生应用、安装两套 Agent Hooks,并向 `~/.zshrc` 追加带明确标记的
114
127
  `codex` 与 `claude` alias,不会覆盖真实的 CLI 二进制。首次安装需要新开终端让 alias 生效;以后升级只需执行 npm 命令。
128
+ 同时会将标准 macOS 应用安装到 `~/Applications/CC Pets.app`,可从 Finder 或 Launchpad 启动,
129
+ 不需要管理员权限。npm 升级时会同步更新该应用。
115
130
 
116
131
  ### 从旧版升级
117
132
 
118
133
  从使用 `codex-pet` 命令的旧版升级时,直接安装新版即可:
119
134
 
120
135
  ```bash
121
- npm install -g cc-pets@latest
136
+ npm install -g cc-pets@latest \
137
+ --allow-scripts=cc-pets \
138
+ --prefer-online
122
139
  ```
123
140
 
124
141
  新版安装器会自动移除旧版 Hooks、恢复并重新接入 Claude status line,同时替换旧的 shell alias 标记,
@@ -161,6 +178,9 @@ cc-pets install
161
178
  # 安全移除 Hooks、恢复 Claude status line,并清理 shell alias
162
179
  cc-pets uninstall
163
180
 
181
+ # 仅删除 ~/Applications 中的 macOS 应用(不会删除 npm 包或 Hooks)
182
+ cc-pets uninstall-app
183
+
164
184
  # 启动桌宠后进入 Codex CLI
165
185
  codex-with-pet
166
186
 
@@ -168,6 +188,10 @@ codex-with-pet
168
188
  claude-with-pet
169
189
  ```
170
190
 
191
+ 项目版本以 `package.json` 为唯一来源。发布新版本时执行 `npm version patch`、
192
+ `npm version minor` 或 `npm version major`;npm 会自动运行完整测试,构建过程会将新版本写入
193
+ 生成的 App `Info.plist`,无需手动修改 `Resources/Info.plist`。
194
+
171
195
  ## 用量数据
172
196
 
173
197
  Codex 用量来自 `~/.codex/sessions` 的本地 `token_count` 事件:
@@ -229,6 +253,7 @@ npx petdex install <slug>
229
253
 
230
254
  ```bash
231
255
  cc-pets uninstall
256
+ cc-pets uninstall-app
232
257
  source ~/.zshrc
233
258
  npm uninstall -g cc-pets
234
259
  ```
@@ -16,10 +16,6 @@
16
16
  <string>CC Pets</string>
17
17
  <key>CFBundlePackageType</key>
18
18
  <string>APPL</string>
19
- <key>CFBundleShortVersionString</key>
20
- <string>0.2.0</string>
21
- <key>CFBundleVersion</key>
22
- <string>2</string>
23
19
  <key>LSMinimumSystemVersion</key>
24
20
  <string>13.0</string>
25
21
  <key>LSUIElement</key>
@@ -825,7 +825,11 @@ static int RenderQuotaDashboard(NSString *path) {
825
825
  - (void)applicationDidFinishLaunching:(NSNotification *)notification {
826
826
  self.managedByCLI = [NSProcessInfo.processInfo.arguments containsObject:@"--managed"];
827
827
  NSString *binaryDir = NSProcessInfo.processInfo.arguments.firstObject.stringByStandardizingPath.stringByDeletingLastPathComponent;
828
- self.binaryDirectory = binaryDir;
828
+ NSBundle *mainBundle = NSBundle.mainBundle;
829
+ BOOL runsFromAppBundle = [mainBundle.bundlePath.pathExtension.lowercaseString isEqualToString:@"app"];
830
+ self.binaryDirectory = runsFromAppBundle && mainBundle.resourcePath.length > 0
831
+ ? mainBundle.resourcePath
832
+ : binaryDir;
829
833
  NSArray<NSDictionary *> *petOptions = [self waitForPetOptions];
830
834
  if (petOptions.count == 0) {
831
835
  [NSApp terminate:nil];
package/bin/cc-pets CHANGED
@@ -4,7 +4,8 @@ set -eu
4
4
  SCRIPT_DIR="${0:A:h}"
5
5
  PROJECT_DIR="${SCRIPT_DIR:h}"
6
6
  PET_BIN="${PROJECT_DIR}/.build/release/cc-pets"
7
- PET_APP="${PROJECT_DIR}/.build/release/CC Pets.app"
7
+ BUILD_APP="${PROJECT_DIR}/.build/release/CC Pets.app"
8
+ INSTALLED_APP="${CC_PETS_APPLICATIONS_DIR:-${HOME}/Applications}/CC Pets.app"
8
9
 
9
10
  if [[ "${1:-}" == "install" ]]; then
10
11
  exec "${PROJECT_DIR}/scripts/install-shell-integration.sh"
@@ -14,15 +15,23 @@ if [[ "${1:-}" == "uninstall" ]]; then
14
15
  exec "${PROJECT_DIR}/scripts/uninstall-shell-integration.sh"
15
16
  fi
16
17
 
18
+ if [[ "${1:-}" == "uninstall-app" ]]; then
19
+ exec "${PROJECT_DIR}/scripts/uninstall-app.sh"
20
+ fi
21
+
17
22
  if [[ "${1:-}" == "build" ]]; then
18
23
  exec "${PROJECT_DIR}/scripts/build.sh"
19
24
  fi
20
25
 
21
- if [[ ! -x "${PET_BIN}" || ! -d "${PET_APP}" ]]; then
26
+ if [[ ! -x "${PET_BIN}" || ! -d "${BUILD_APP}" ]]; then
22
27
  "${PROJECT_DIR}/scripts/build.sh" >/dev/null
23
28
  fi
24
29
 
25
30
  if [[ $# -eq 0 ]]; then
31
+ PET_APP="${BUILD_APP}"
32
+ if [[ -d "${INSTALLED_APP}" ]]; then
33
+ PET_APP="${INSTALLED_APP}"
34
+ fi
26
35
  open -g "${PET_APP}"
27
36
  exit 0
28
37
  fi
@@ -4,7 +4,8 @@ set -eu
4
4
  SCRIPT_DIR="${0:A:h}"
5
5
  PROJECT_DIR="${SCRIPT_DIR:h}"
6
6
  PET_BIN="${PROJECT_DIR}/.build/release/cc-pets"
7
- PET_APP="${PROJECT_DIR}/.build/release/CC Pets.app"
7
+ BUILD_APP="${PROJECT_DIR}/.build/release/CC Pets.app"
8
+ INSTALLED_APP="${CC_PETS_APPLICATIONS_DIR:-${HOME}/Applications}/CC Pets.app"
8
9
  REAL_CLAUDE="${CLAUDE_REAL_BIN:-}"
9
10
  CLIENT_DIR="${${TMPDIR:-/tmp/}%/}/cc-pets-$(id -u)-clients"
10
11
  CLIENT_FILE="${CLIENT_DIR}/$$"
@@ -17,10 +18,15 @@ if [[ -z "${REAL_CLAUDE}" || ! -x "${REAL_CLAUDE}" ]]; then
17
18
  exit 127
18
19
  fi
19
20
 
20
- if [[ ! -x "${PET_BIN}" || ! -d "${PET_APP}" ]]; then
21
+ if [[ ! -x "${PET_BIN}" || ! -d "${BUILD_APP}" ]]; then
21
22
  "${PROJECT_DIR}/scripts/build.sh" >/dev/null
22
23
  fi
23
24
 
25
+ PET_APP="${BUILD_APP}"
26
+ if [[ -d "${INSTALLED_APP}" ]]; then
27
+ PET_APP="${INSTALLED_APP}"
28
+ fi
29
+
24
30
  mkdir -p "${CLIENT_DIR}"
25
31
  touch "${CLIENT_FILE}"
26
32
 
@@ -4,7 +4,8 @@ set -eu
4
4
  SCRIPT_DIR="${0:A:h}"
5
5
  PROJECT_DIR="${SCRIPT_DIR:h}"
6
6
  PET_BIN="${PROJECT_DIR}/.build/release/cc-pets"
7
- PET_APP="${PROJECT_DIR}/.build/release/CC Pets.app"
7
+ BUILD_APP="${PROJECT_DIR}/.build/release/CC Pets.app"
8
+ INSTALLED_APP="${CC_PETS_APPLICATIONS_DIR:-${HOME}/Applications}/CC Pets.app"
8
9
  REAL_CODEX="${CODEX_REAL_BIN:-}"
9
10
  CLIENT_DIR="${${TMPDIR:-/tmp/}%/}/cc-pets-$(id -u)-clients"
10
11
  CLIENT_FILE="${CLIENT_DIR}/$$"
@@ -17,10 +18,15 @@ if [[ -z "${REAL_CODEX}" || ! -x "${REAL_CODEX}" ]]; then
17
18
  exit 127
18
19
  fi
19
20
 
20
- if [[ ! -x "${PET_BIN}" || ! -d "${PET_APP}" ]]; then
21
+ if [[ ! -x "${PET_BIN}" || ! -d "${BUILD_APP}" ]]; then
21
22
  "${PROJECT_DIR}/scripts/build.sh" >/dev/null
22
23
  fi
23
24
 
25
+ PET_APP="${BUILD_APP}"
26
+ if [[ -d "${INSTALLED_APP}" ]]; then
27
+ PET_APP="${INSTALLED_APP}"
28
+ fi
29
+
24
30
  mkdir -p "${CLIENT_DIR}"
25
31
  touch "${CLIENT_FILE}"
26
32
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cc-pets",
3
- "version": "0.2.3",
3
+ "version": "0.2.6",
4
4
  "description": "A native macOS desktop pet for Codex CLI and Claude Code",
5
5
  "author": "wangxinyusqn",
6
6
  "license": "MIT",
@@ -48,6 +48,7 @@
48
48
  "scripts": {
49
49
  "build": "./scripts/build.sh",
50
50
  "test": "./tests/test.sh",
51
+ "version": "npm test",
51
52
  "postinstall": "./scripts/install-shell-integration.sh",
52
53
  "prepack": "npm test"
53
54
  },
package/scripts/build.sh CHANGED
@@ -21,13 +21,18 @@ CLANG_MODULE_CACHE_PATH="${CACHE_DIR}" clang \
21
21
 
22
22
  find "${BUILD_DIR}" -maxdepth 1 -type f \( -name '*.webp' -o -name '*.png' \) -delete
23
23
  find "${APP_MACOS_DIR}" -maxdepth 1 -type f \( -name '*.webp' -o -name '*.png' \) -delete
24
+ find "${APP_RESOURCES_DIR}" -maxdepth 1 -type f \( -name '*.webp' -o -name '*.png' \) -delete
24
25
  SPRITES=("${RESOURCE_DIR}"/*.webp(N) "${RESOURCE_DIR}"/*.png(N))
25
26
  if (( ${#SPRITES[@]} > 0 )); then
26
27
  cp "${SPRITES[@]}" "${BUILD_DIR}/"
27
- cp "${SPRITES[@]}" "${APP_MACOS_DIR}/"
28
+ cp "${SPRITES[@]}" "${APP_RESOURCES_DIR}/"
28
29
  fi
29
30
  cp "${BUILD_DIR}/cc-pets" "${APP_MACOS_DIR}/cc-pets"
30
31
  cp "${PROJECT_DIR}/Resources/Info.plist" "${APP_DIR}/Contents/Info.plist"
31
32
  cp "${PROJECT_DIR}/Resources/AppIcon.icns" "${APP_RESOURCES_DIR}/AppIcon.icns"
33
+ PACKAGE_VERSION="$(node -p "require('${PROJECT_DIR}/package.json').version")"
34
+ /usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string ${PACKAGE_VERSION}" "${APP_DIR}/Contents/Info.plist"
35
+ /usr/libexec/PlistBuddy -c "Add :CFBundleVersion string ${PACKAGE_VERSION}" "${APP_DIR}/Contents/Info.plist"
36
+ /usr/bin/codesign --force --sign - "${APP_DIR}" >/dev/null
32
37
  print "构建完成: ${BUILD_DIR}/cc-pets"
33
38
  print "应用完成: ${APP_DIR}"
@@ -0,0 +1,36 @@
1
+ #!/bin/zsh
2
+ set -eu
3
+
4
+ SCRIPT_DIR="${0:A:h}"
5
+ PROJECT_DIR="${SCRIPT_DIR:h}"
6
+ SOURCE_APP="${PROJECT_DIR}/.build/release/CC Pets.app"
7
+ APPLICATIONS_DIR="${CC_PETS_APPLICATIONS_DIR:-${HOME}/Applications}"
8
+ TARGET_APP="${APPLICATIONS_DIR}/CC Pets.app"
9
+
10
+ if [[ ! -d "${SOURCE_APP}" ]]; then
11
+ "${PROJECT_DIR}/scripts/build.sh" >/dev/null
12
+ fi
13
+
14
+ mkdir -p "${APPLICATIONS_DIR}"
15
+ STAGING_DIR="$(mktemp -d "${APPLICATIONS_DIR}/.cc-pets-install.XXXXXX")"
16
+ STAGING_APP="${STAGING_DIR}/CC Pets.app"
17
+ BACKUP_APP="${STAGING_DIR}/previous.app"
18
+
19
+ cleanup() {
20
+ rm -rf "${STAGING_DIR}"
21
+ }
22
+ trap cleanup EXIT
23
+
24
+ /usr/bin/ditto "${SOURCE_APP}" "${STAGING_APP}"
25
+ if [[ -e "${TARGET_APP}" ]]; then
26
+ mv "${TARGET_APP}" "${BACKUP_APP}"
27
+ fi
28
+ if ! mv "${STAGING_APP}" "${TARGET_APP}"; then
29
+ if [[ -e "${BACKUP_APP}" ]]; then
30
+ mv "${BACKUP_APP}" "${TARGET_APP}"
31
+ fi
32
+ print -u2 "安装 CC Pets.app 失败,已保留原应用。"
33
+ exit 1
34
+ fi
35
+
36
+ print "应用已安装: ${TARGET_APP}"
@@ -13,6 +13,7 @@ CLAUDE_END_MARKER="# <<< cc-pets-claude <<<"
13
13
 
14
14
  node "${PROJECT_DIR}/scripts/uninstall-integrations.mjs" --prepare-install "${SHELL_RC}"
15
15
  "${PROJECT_DIR}/scripts/build.sh"
16
+ "${PROJECT_DIR}/scripts/install-app.sh"
16
17
  node "${PROJECT_DIR}/scripts/install-codex-hooks.mjs" "${PROJECT_DIR}/.build/release/cc-pets"
17
18
  node "${PROJECT_DIR}/scripts/install-claude-hooks.mjs" \
18
19
  "${PROJECT_DIR}/.build/release/cc-pets" \
@@ -20,9 +21,11 @@ node "${PROJECT_DIR}/scripts/install-claude-hooks.mjs" \
20
21
 
21
22
  PET_APP="${PROJECT_DIR}/.build/release/CC Pets.app"
22
23
  PET_APP_EXECUTABLE="${PET_APP}/Contents/MacOS/cc-pets"
24
+ INSTALLED_PET_APP="${CC_PETS_APPLICATIONS_DIR:-${HOME}/Applications}/CC Pets.app"
25
+ INSTALLED_PET_APP_EXECUTABLE="${INSTALLED_PET_APP}/Contents/MacOS/cc-pets"
23
26
  LEGACY_PET_APP_EXECUTABLE="${PROJECT_DIR}/.build/release/CodexPet.app/Contents/MacOS/codex-pet"
24
27
  PET_WAS_RUNNING=0
25
- for executable in "${PET_APP_EXECUTABLE}" "${LEGACY_PET_APP_EXECUTABLE}"; do
28
+ for executable in "${PET_APP_EXECUTABLE}" "${INSTALLED_PET_APP_EXECUTABLE}" "${LEGACY_PET_APP_EXECUTABLE}"; do
26
29
  if pgrep -f "${executable}" >/dev/null 2>&1; then
27
30
  pkill -f "${executable}" || true
28
31
  PET_WAS_RUNNING=1
@@ -31,12 +34,13 @@ done
31
34
  if (( PET_WAS_RUNNING )); then
32
35
  for _ in {1..30}; do
33
36
  if ! pgrep -f "${PET_APP_EXECUTABLE}" >/dev/null 2>&1 && \
37
+ ! pgrep -f "${INSTALLED_PET_APP_EXECUTABLE}" >/dev/null 2>&1 && \
34
38
  ! pgrep -f "${LEGACY_PET_APP_EXECUTABLE}" >/dev/null 2>&1; then
35
39
  break
36
40
  fi
37
41
  sleep 0.1
38
42
  done
39
- open -g "${PET_APP}" --args --managed
43
+ open -g "${INSTALLED_PET_APP}" --args --managed
40
44
  print "已重启正在运行的桌宠,使新版本立即生效。"
41
45
  fi
42
46
 
@@ -58,5 +62,5 @@ if ! grep -Fq "${CLAUDE_START_MARKER}" "${SHELL_RC}" 2>/dev/null; then
58
62
  } >> "${SHELL_RC}"
59
63
  fi
60
64
 
61
- print "安装完成。执行 source ${(q)SHELL_RC},之后运行 codex 或 claude 会自动启动桌宠。"
65
+ print "安装完成。CC Pets 已加入 ${(q)INSTALLED_PET_APP};执行 source ${(q)SHELL_RC},之后运行 codex 或 claude 会自动启动桌宠。"
62
66
  print "首次启动后执行 /hooks,信任 CC Pets Hooks 以启用 Agent 工作动画。"
@@ -0,0 +1,17 @@
1
+ #!/bin/zsh
2
+ set -eu
3
+
4
+ APPLICATIONS_DIR="${CC_PETS_APPLICATIONS_DIR:-${HOME}/Applications}"
5
+ TARGET_APP="${APPLICATIONS_DIR}/CC Pets.app"
6
+ TARGET_EXECUTABLE="${TARGET_APP}/Contents/MacOS/cc-pets"
7
+
8
+ if [[ "${CC_PETS_SKIP_APP_STOP:-0}" != "1" ]] && pgrep -f "${TARGET_EXECUTABLE}" >/dev/null 2>&1; then
9
+ pkill -f "${TARGET_EXECUTABLE}" || true
10
+ fi
11
+
12
+ if [[ -e "${TARGET_APP}" ]]; then
13
+ rm -rf "${TARGET_APP}"
14
+ print "已删除应用: ${TARGET_APP}"
15
+ else
16
+ print "未安装应用: ${TARGET_APP}"
17
+ fi