openclaw-multi-auto 1.0.9 → 1.1.1

package/scripts/create-dmg.sh

@@ -0,0 +1,176 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Create a styled DMG containing the app bundle + /Applications symlink.
+#
+# Usage:
+#   scripts/create-dmg.sh <app_path> [output_dmg]
+#
+# Env:
+#   DMG_VOLUME_NAME        default: CFBundleName (or "OpenClaw")
+#   DMG_BACKGROUND_PATH    default: assets/dmg-background.png
+#   DMG_BACKGROUND_SMALL   default: assets/dmg-background-small.png (recommended)
+#   DMG_WINDOW_BOUNDS      default: "400 100 900 420" (500x320)
+#   DMG_ICON_SIZE          default: 128
+#   DMG_APP_POS            default: "125 160"
+#   DMG_APPS_POS           default: "375 160"
+#   SKIP_DMG_STYLE=1       skip Finder styling
+#   DMG_EXTRA_SECTORS      extra sectors to keep when shrinking RW image (default: 2048)
+
+APP_PATH="${1:-}"
+OUT_PATH="${2:-}"
+
+if [[ -z "$APP_PATH" ]]; then
+  echo "Usage: $0 <app_path> [output_dmg]" >&2
+  exit 1
+fi
+if [[ ! -d "$APP_PATH" ]]; then
+  echo "Error: App not found: $APP_PATH" >&2
+  exit 1
+fi
+
+ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
+BUILD_DIR="$ROOT_DIR/dist"
+mkdir -p "$BUILD_DIR"
+
+APP_NAME=$(/usr/libexec/PlistBuddy -c "Print CFBundleName" "$APP_PATH/Contents/Info.plist" 2>/dev/null || echo "OpenClaw")
+VERSION=$(/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" "$APP_PATH/Contents/Info.plist" 2>/dev/null || echo "0.0.0")
+
+DMG_NAME="${APP_NAME}-${VERSION}.dmg"
+DMG_VOLUME_NAME="${DMG_VOLUME_NAME:-$APP_NAME}"
+DMG_BACKGROUND_SMALL="${DMG_BACKGROUND_SMALL:-$ROOT_DIR/assets/dmg-background-small.png}"
+DMG_BACKGROUND_PATH="${DMG_BACKGROUND_PATH:-$ROOT_DIR/assets/dmg-background.png}"
+
+DMG_WINDOW_BOUNDS="${DMG_WINDOW_BOUNDS:-400 100 900 420}"
+DMG_ICON_SIZE="${DMG_ICON_SIZE:-128}"
+DMG_APP_POS="${DMG_APP_POS:-125 160}"
+DMG_APPS_POS="${DMG_APPS_POS:-375 160}"
+DMG_EXTRA_SECTORS="${DMG_EXTRA_SECTORS:-2048}"
+
+to_applescript_list4() {
+  local raw="$1"
+  echo "$raw" | awk '{ printf "%s, %s, %s, %s", $1, $2, $3, $4 }'
+}
+
+to_applescript_pair() {
+  local raw="$1"
+  echo "$raw" | awk '{ printf "%s, %s", $1, $2 }'
+}
+
+if [[ -z "$OUT_PATH" ]]; then
+  OUT_PATH="$BUILD_DIR/$DMG_NAME"
+fi
+
+echo "Creating DMG: $OUT_PATH"
+
+# Cleanup stuck volumes.
+for vol in "/Volumes/$DMG_VOLUME_NAME"* "/Volumes/$APP_NAME"*; do
+  if [[ -d "$vol" ]]; then
+    hdiutil detach "$vol" -force 2>/dev/null || true
+    sleep 1
+  fi
+done
+
+DMG_TEMP="$(mktemp -d /tmp/openclaw-dmg.XXXXXX)"
+trap 'hdiutil detach "/Volumes/'"$DMG_VOLUME_NAME"'" -force 2>/dev/null || true; rm -rf "$DMG_TEMP" 2>/dev/null || true' EXIT
+
+cp -R "$APP_PATH" "$DMG_TEMP/"
+ln -s /Applications "$DMG_TEMP/Applications"
+
+APP_SIZE_MB=$(du -sm "$APP_PATH" | awk '{print $1}')
+DMG_SIZE_MB=$((APP_SIZE_MB + 80))
+
+DMG_RW_PATH="${OUT_PATH%.dmg}-rw.dmg"
+rm -f "$DMG_RW_PATH" "$OUT_PATH"
+
+hdiutil create \
+  -volname "$DMG_VOLUME_NAME" \
+  -srcfolder "$DMG_TEMP" \
+  -ov \
+  -format UDRW \
+  -size "${DMG_SIZE_MB}m" \
+  "$DMG_RW_PATH"
+
+MOUNT_POINT="/Volumes/$DMG_VOLUME_NAME"
+if [[ -d "$MOUNT_POINT" ]]; then
+  hdiutil detach "$MOUNT_POINT" -force 2>/dev/null || true
+  sleep 2
+fi
+hdiutil attach "$DMG_RW_PATH" -mountpoint "$MOUNT_POINT" -nobrowse
+
+if [[ "${SKIP_DMG_STYLE:-0}" != "1" ]]; then
+  mkdir -p "$MOUNT_POINT/.background"
+  if [[ -f "$DMG_BACKGROUND_SMALL" ]]; then
+    cp "$DMG_BACKGROUND_SMALL" "$MOUNT_POINT/.background/background.png"
+  elif [[ -f "$DMG_BACKGROUND_PATH" ]]; then
+    cp "$DMG_BACKGROUND_PATH" "$MOUNT_POINT/.background/background.png"
+  else
+    echo "WARN: DMG background missing: $DMG_BACKGROUND_SMALL / $DMG_BACKGROUND_PATH" >&2
+  fi
+
+  # Volume icon: reuse the app icon if available.
+  ICON_SRC="$ROOT_DIR/apps/macos/Sources/OpenClaw/Resources/OpenClaw.icns"
+  if [[ -f "$ICON_SRC" ]]; then
+    cp "$ICON_SRC" "$MOUNT_POINT/.VolumeIcon.icns"
+    if command -v SetFile >/dev/null 2>&1; then
+      SetFile -a C "$MOUNT_POINT" 2>/dev/null || true
+    fi
+  fi
+
+  osascript <<EOF
+tell application "Finder"
+  tell disk "$DMG_VOLUME_NAME"
+    open
+    set current view of container window to icon view
+    set toolbar visible of container window to false
+    set statusbar visible of container window to false
+    set the bounds of container window to {$(to_applescript_list4 "$DMG_WINDOW_BOUNDS")}
+    set viewOptions to the icon view options of container window
+    set arrangement of viewOptions to not arranged
+    set icon size of viewOptions to ${DMG_ICON_SIZE}
+    if exists file ".background:background.png" then
+      set background picture of viewOptions to file ".background:background.png"
+    end if
+    set text size of viewOptions to 12
+    set label position of viewOptions to bottom
+    set shows item info of viewOptions to false
+    set shows icon preview of viewOptions to true
+    set position of item "${APP_NAME}.app" of container window to {$(to_applescript_pair "$DMG_APP_POS")}
+    set position of item "Applications" of container window to {$(to_applescript_pair "$DMG_APPS_POS")}
+    update without registering applications
+    delay 2
+    close
+    open
+    delay 1
+  end tell
+end tell
+EOF
+
+  sleep 2
+  osascript -e 'tell application "Finder" to close every window' || true
+fi
+
+for i in {1..5}; do
+  if hdiutil detach "$MOUNT_POINT" -quiet 2>/dev/null; then
+    break
+  fi
+  if [[ "$i" == "3" ]]; then
+    hdiutil detach "$MOUNT_POINT" -force 2>/dev/null || true
+  fi
+  sleep 2
+done
+
+hdiutil resize -limits "$DMG_RW_PATH" >/tmp/openclaw-dmg-limits.txt 2>/dev/null || true
+MIN_SECTORS="$(tail -n 1 /tmp/openclaw-dmg-limits.txt 2>/dev/null | awk '{print $1}')"
+rm -f /tmp/openclaw-dmg-limits.txt
+if [[ "$MIN_SECTORS" =~ ^[0-9]+$ ]] && [[ "$DMG_EXTRA_SECTORS" =~ ^[0-9]+$ ]]; then
+  TARGET_SECTORS=$((MIN_SECTORS + DMG_EXTRA_SECTORS))
+  echo "Shrinking RW image: min sectors=$MIN_SECTORS (+$DMG_EXTRA_SECTORS) -> $TARGET_SECTORS"
+  hdiutil resize -sectors "$TARGET_SECTORS" "$DMG_RW_PATH" >/dev/null 2>&1 || true
+fi
+
+hdiutil convert "$DMG_RW_PATH" -format ULMO -o "$OUT_PATH" -ov
+rm -f "$DMG_RW_PATH"
+
+hdiutil verify "$OUT_PATH" >/dev/null
+echo "✅ DMG ready: $OUT_PATH"

package/scripts/create-instance.sh

@@ -129,12 +129,15 @@ fi
 cp "${SOURCE_CODE}/package.json" "${INSTANCE_DIR}/package.json"
 [ -f "${SOURCE_CODE}/pnpm-lock.yaml" ] && cp "${SOURCE_CODE}/pnpm-lock.yaml" "${INSTANCE_DIR}/pnpm-lock.yaml"
 
-# --- 6. 固化本地依赖 ---
+# --- 6. 固化本地依赖 (路径锁定版) ---
 echo -e "${BLUE}📦 正在固化运行环境 (pnpm)...${NC}"
 export SHARP_BINARY_HOST="https://npmmirror.com/mirrors/sharp"
 export SHARP_LIBVIPS_BINARY_HOST="https://npmmirror.com/mirrors/sharp-libvips"
 
+# 🛑 关键修复：显式进入实例物理目录，确保 node_modules 生成在正确位置
 cd "${INSTANCE_DIR}"
+echo -e "${YELLOW}📍 安装路径确认: $(pwd)${NC}"
+
 pnpm install --shamefully-hoist --registry=https://registry.npmmirror.com 2>&1 | grep -v "WARN" | head -n 5
 
 # --- 7. 预装飞书运维技能与引导任务 ---

package/scripts/cron_usage_report.ts

@@ -0,0 +1,273 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+
+type Usage = {
+  input_tokens?: number;
+  output_tokens?: number;
+  total_tokens?: number;
+  cache_read_tokens?: number;
+  cache_write_tokens?: number;
+};
+
+type CronRunLogEntry = {
+  ts: number;
+  jobId: string;
+  action: "finished";
+  status?: "ok" | "error" | "skipped";
+  model?: string;
+  provider?: string;
+  usage?: Usage;
+};
+
+function parseArgs(argv: string[]) {
+  const args: Record<string, string | boolean> = {};
+  for (let i = 2; i < argv.length; i++) {
+    const a = argv[i] ?? "";
+    if (!a.startsWith("--")) {
+      continue;
+    }
+    const key = a.slice(2);
+    const next = argv[i + 1];
+    if (next && !next.startsWith("--")) {
+      args[key] = next;
+      i++;
+    } else {
+      args[key] = true;
+    }
+  }
+  return args;
+}
+
+function usageAndExit(code: number): never {
+  console.error(
+    [
+      "cron_usage_report.ts",
+      "",
+      "Required (choose one):",
+      "  --store <path-to-cron-store-json>   (derive runs dir as dirname(store)/runs)",
+      "  --runsDir <path-to-runs-dir>",
+      "",
+      "Time window:",
+      "  --hours <n>        (default 24)",
+      "  --from <iso>       (overrides --hours)",
+      "  --to <iso>         (default now)",
+      "",
+      "Filters:",
+      "  --jobId <id>",
+      "  --model <name>",
+      "",
+      "Output:",
+      "  --json             (emit JSON)",
+    ].join("\n"),
+  );
+  process.exit(code);
+}
+
+async function listJsonlFiles(dir: string): Promise<string[]> {
+  const entries = await fs.readdir(dir, { withFileTypes: true }).catch(() => []);
+  return entries
+    .filter((e) => e.isFile() && e.name.endsWith(".jsonl"))
+    .map((e) => path.join(dir, e.name));
+}
+
+function safeParseLine(line: string): CronRunLogEntry | null {
+  try {
+    const obj = JSON.parse(line) as Partial<CronRunLogEntry> | null;
+    if (!obj || typeof obj !== "object") {
+      return null;
+    }
+    if (obj.action !== "finished") {
+      return null;
+    }
+    if (typeof obj.ts !== "number" || !Number.isFinite(obj.ts)) {
+      return null;
+    }
+    if (typeof obj.jobId !== "string" || !obj.jobId.trim()) {
+      return null;
+    }
+    return obj as CronRunLogEntry;
+  } catch {
+    return null;
+  }
+}
+
+function fmtInt(n: number) {
+  return new Intl.NumberFormat("en-US", { maximumFractionDigits: 0 }).format(n);
+}
+
+export async function main() {
+  const args = parseArgs(process.argv);
+  const store = typeof args.store === "string" ? args.store : undefined;
+  const runsDirArg = typeof args.runsDir === "string" ? args.runsDir : undefined;
+  const runsDir =
+    runsDirArg ?? (store ? path.join(path.dirname(path.resolve(store)), "runs") : null);
+  if (!runsDir) {
+    usageAndExit(2);
+  }
+
+  const hours = typeof args.hours === "string" ? Number(args.hours) : 24;
+  const toMs = typeof args.to === "string" ? Date.parse(args.to) : Date.now();
+  const fromMs =
+    typeof args.from === "string"
+      ? Date.parse(args.from)
+      : toMs - Math.max(1, Number.isFinite(hours) ? hours : 24) * 60 * 60 * 1000;
+
+  if (!Number.isFinite(fromMs) || !Number.isFinite(toMs)) {
+    console.error("Invalid --from/--to timestamp");
+    process.exit(2);
+  }
+
+  const filterJobId = typeof args.jobId === "string" ? args.jobId.trim() : "";
+  const filterModel = typeof args.model === "string" ? args.model.trim() : "";
+  const asJson = args.json === true;
+
+  const files = await listJsonlFiles(runsDir);
+  const totalsByJob: Record<
+    string,
+    {
+      jobId: string;
+      runs: number;
+      models: Record<
+        string,
+        {
+          model: string;
+          runs: number;
+          input_tokens: number;
+          output_tokens: number;
+          total_tokens: number;
+          missingUsageRuns: number;
+        }
+      >;
+      input_tokens: number;
+      output_tokens: number;
+      total_tokens: number;
+      missingUsageRuns: number;
+    }
+  > = {};
+
+  for (const file of files) {
+    const raw = await fs.readFile(file, "utf-8").catch(() => "");
+    if (!raw.trim()) {
+      continue;
+    }
+    const lines = raw.split("\n");
+    for (const line of lines) {
+      const entry = safeParseLine(line.trim());
+      if (!entry) {
+        continue;
+      }
+      if (entry.ts < fromMs || entry.ts > toMs) {
+        continue;
+      }
+      if (filterJobId && entry.jobId !== filterJobId) {
+        continue;
+      }
+      const model = (entry.model ?? "<unknown>").trim() || "<unknown>";
+      if (filterModel && model !== filterModel) {
+        continue;
+      }
+
+      const jobId = entry.jobId;
+      const usage = entry.usage;
+      const hasUsage = Boolean(
+        usage && (usage.total_tokens ?? usage.input_tokens ?? usage.output_tokens) !== undefined,
+      );
+
+      const jobAgg = (totalsByJob[jobId] ??= {
+        jobId,
+        runs: 0,
+        models: {},
+        input_tokens: 0,
+        output_tokens: 0,
+        total_tokens: 0,
+        missingUsageRuns: 0,
+      });
+      jobAgg.runs++;
+
+      const modelAgg = (jobAgg.models[model] ??= {
+        model,
+        runs: 0,
+        input_tokens: 0,
+        output_tokens: 0,
+        total_tokens: 0,
+        missingUsageRuns: 0,
+      });
+      modelAgg.runs++;
+
+      if (!hasUsage) {
+        jobAgg.missingUsageRuns++;
+        modelAgg.missingUsageRuns++;
+        continue;
+      }
+
+      const input = Math.max(0, Math.trunc(usage?.input_tokens ?? 0));
+      const output = Math.max(0, Math.trunc(usage?.output_tokens ?? 0));
+      const total = Math.max(0, Math.trunc(usage?.total_tokens ?? input + output));
+
+      jobAgg.input_tokens += input;
+      jobAgg.output_tokens += output;
+      jobAgg.total_tokens += total;
+
+      modelAgg.input_tokens += input;
+      modelAgg.output_tokens += output;
+      modelAgg.total_tokens += total;
+    }
+  }
+
+  const rows = Object.values(totalsByJob)
+    .map((r) => ({
+      ...r,
+      models: Object.values(r.models).toSorted((a, b) => b.total_tokens - a.total_tokens),
+    }))
+    .toSorted((a, b) => b.total_tokens - a.total_tokens);
+
+  if (asJson) {
+    process.stdout.write(
+      JSON.stringify(
+        {
+          from: new Date(fromMs).toISOString(),
+          to: new Date(toMs).toISOString(),
+          runsDir,
+          jobs: rows,
+        },
+        null,
+        2,
+      ) + "\n",
+    );
+    return;
+  }
+
+  console.log(`Cron usage report`);
+  console.log(`  runsDir: ${runsDir}`);
+  console.log(`  window: ${new Date(fromMs).toISOString()} → ${new Date(toMs).toISOString()}`);
+  if (filterJobId) {
+    console.log(`  filter jobId: ${filterJobId}`);
+  }
+  if (filterModel) {
+    console.log(`  filter model: ${filterModel}`);
+  }
+  console.log("");
+
+  if (rows.length === 0) {
+    console.log("No matching cron run entries found.");
+    return;
+  }
+
+  for (const job of rows) {
+    console.log(`jobId: ${job.jobId}`);
+    console.log(`  runs: ${fmtInt(job.runs)} (missing usage: ${fmtInt(job.missingUsageRuns)})`);
+    console.log(
+      `  tokens: total ${fmtInt(job.total_tokens)} (in ${fmtInt(job.input_tokens)} / out ${fmtInt(job.output_tokens)})`,
+    );
+    for (const m of job.models) {
+      console.log(
+        `    model ${m.model}: runs ${fmtInt(m.runs)} (missing usage: ${fmtInt(m.missingUsageRuns)}), total ${fmtInt(m.total_tokens)} (in ${fmtInt(m.input_tokens)} / out ${fmtInt(m.output_tokens)})`,
+      );
+    }
+    console.log("");
+  }
+}
+
+if (import.meta.url === `file://${process.argv[1]}`) {
+  void main();
+}