cortico-world-hands 0.20.2 → 0.20.4

package/dist/index.js

@@ -233,9 +233,9 @@ var HANDS_LOOK_CONFIG_GROUP = {
 };
 
 // src/world.ts
-import { writeFileSync as writeFileSync2 } from "node:fs";
+import { writeFileSync as writeFileSync4 } from "node:fs";
 import { fileURLToPath } from "node:url";
-import { join as join2 } from "node:path";
+import { join as join4 } from "node:path";
 
 // src/policy.ts
 var PASS_RULES = [
@@ -513,9 +513,167 @@ var Honcho = class {
   }
 };
 
-// src/stores.ts
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+// src/sync.ts
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+var START = "<!--yixin:sync:start-->";
+var END = "<!--yixin:sync:end-->";
+function readMaybe(path) {
+  try {
+    return existsSync(path) ? readFileSync(path, "utf8") : "";
+  } catch {
+    return "";
+  }
+}
+function mergeMemorySection(file, rows) {
+  const body = rows.filter((r) => r && r.key && r.value).map((r) => `- **${r.key}**\uFF1A${r.value.replace(/\s+/g, " ").trim()}`).join("\n");
+  const section = `${START}
+## \u4ECE\u61FF\u5FC3\u540C\u6B65\u8FC7\u6765\u7684\u8BB0\u5FC6\uFF08${(/* @__PURE__ */ new Date()).toISOString().slice(0, 10)}\uFF09
+${body}
+${END}`;
+  const old = readMaybe(file);
+  let next;
+  if (old.includes(START) && old.includes(END)) {
+    next = old.slice(0, old.indexOf(START)) + section + old.slice(old.indexOf(END) + END.length);
+  } else {
+    next = (old ? old.trimEnd() + "\n\n" : "") + section + "\n";
+  }
+  if (next === old) return { lines: rows.length, wrote: false };
+  writeFileSync(file, next);
+  return { lines: rows.length, wrote: true };
+}
+function readPersona(dir) {
+  for (const name of ["CONSTITUTION.md", "constitution.md"]) {
+    const text = readMaybe(join(dir, name));
+    if (text.trim()) return text;
+  }
+  return "";
+}
+
+// src/skin.ts
+import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, readdirSync, statSync, unlinkSync, writeFileSync as writeFileSync2, copyFileSync } from "node:fs";
+import { dirname, join as join2, resolve } from "node:path";
+function findWhaleDir(roots) {
+  for (const root of roots) {
+    const candidates = [
+      join2(root, "web", "whale"),
+      join2(root, "pet", "web", "whale"),
+      join2(root, "vendor", "pet", "web", "whale")
+    ];
+    for (const dir of candidates) {
+      if (existsSync2(join2(dir, "model.json"))) return dir;
+    }
+  }
+  return null;
+}
+async function fetchBytes(url) {
+  const res = await fetch(url);
+  if (!res.ok) throw new Error(`\u4E0B\u8F7D\u5931\u8D25 ${res.status} ${url}`);
+  return Buffer.from(await res.arrayBuffer());
+}
+async function installSkinPack(baseUrl, roots, log) {
+  const base = baseUrl.replace(/\/+$/, "");
+  let manifest;
+  try {
+    manifest = JSON.parse((await fetchBytes(`${base}/manifest.json`)).toString("utf8"));
+  } catch (err) {
+    return { ok: false, detail: `\u62FF\u4E0D\u5230 manifest\uFF1A${err.message}` };
+  }
+  if (!manifest?.id || !Array.isArray(manifest.files)) {
+    return { ok: false, detail: "manifest \u683C\u5F0F\u4E0D\u5BF9\uFF1A\u8981 id \u548C files" };
+  }
+  const whaleDir = findWhaleDir(roots);
+  if (!whaleDir) {
+    return { ok: false, detail: `\u6CA1\u627E\u5230 web/whale/model.json\uFF0C\u627E\u8FC7\uFF1A${roots.join(" / ")}` };
+  }
+  try {
+    for (const file of manifest.files) {
+      const target = resolve(whaleDir, file.path);
+      if (!target.startsWith(resolve(whaleDir))) {
+        return { ok: false, detail: `\u8DEF\u5F84\u8D8A\u754C\uFF1A${file.path}` };
+      }
+      mkdirSync(dirname(target), { recursive: true });
+      writeFileSync2(target, await fetchBytes(`${base}/${file.path}`));
+    }
+    const modelPath = join2(whaleDir, "model.json");
+    const model = JSON.parse(readFileSync2(modelPath, "utf8"));
+    const outfits = Array.isArray(model.outfits) ? model.outfits : [];
+    const idx = outfits.findIndex((o) => o?.id === manifest.id);
+    if (idx >= 0) outfits[idx] = manifest.outfit;
+    else outfits.push(manifest.outfit);
+    model.outfits = outfits;
+    copyFileSync(modelPath, `${modelPath}.bak-${Date.now()}`);
+    writeFileSync2(modelPath, JSON.stringify(model, null, 2));
+    log?.info(`\u76AE\u80A4\u88C5\u597D\u4E86\uFF1A${manifest.id}\uFF08web \u76EE\u5F55 ${whaleDir}\uFF09`);
+    return { ok: true, detail: `\u88C5\u597D\u4E86\u300C${manifest.name || manifest.id}\u300D\uFF0C\u5171 ${manifest.files.length} \u4E2A\u6587\u4EF6`, webDir: whaleDir };
+  } catch (err) {
+    log?.warn(`\u76AE\u80A4\u5B89\u88C5\u5931\u8D25\uFF1A${err.message}`);
+    return { ok: false, detail: `\u88C5\u5230\u4E00\u534A\u5931\u8D25\uFF1A${err.message}` };
+  }
+}
+function cleanMedia(mediaDir, opts = {}) {
+  const keepDays = opts.keepDays ?? 1;
+  const maxMB = opts.maxMB ?? 0;
+  const out = { removed: 0, freedMB: 0, kept: 0, dir: mediaDir };
+  let names = [];
+  try {
+    names = readdirSync(mediaDir);
+  } catch {
+    return out;
+  }
+  const files = [];
+  for (const name of names) {
+    const full = join2(mediaDir, name);
+    try {
+      const st = statSync(full);
+      if (!st.isFile()) continue;
+      if (!/\.(jpg|jpeg|png|webp)$/i.test(name)) continue;
+      files.push({ name, full, size: st.size, mtime: st.mtimeMs });
+    } catch {
+    }
+  }
+  const cutoff = Date.now() - keepDays * 864e5;
+  let totalMB = files.reduce((sum, f) => sum + f.size, 0) / 1024 / 1024;
+  for (const f of files) {
+    if (f.mtime >= cutoff) continue;
+    if (!opts.dryRun) {
+      try {
+        unlinkSync(f.full);
+      } catch {
+        continue;
+      }
+    }
+    out.removed += 1;
+    out.freedMB += f.size / 1024 / 1024;
+    totalMB -= f.size / 1024 / 1024;
+  }
+  if (maxMB > 0 && totalMB > maxMB) {
+    const rest = files.filter((f) => f.mtime >= cutoff).sort((a, b) => a.mtime - b.mtime);
+    for (const f of rest) {
+      if (totalMB <= maxMB) break;
+      if (!opts.dryRun) {
+        try {
+          unlinkSync(f.full);
+        } catch {
+          continue;
+        }
+      }
+      out.removed += 1;
+      out.freedMB += f.size / 1024 / 1024;
+      totalMB -= f.size / 1024 / 1024;
+    }
+  }
+  try {
+    out.kept = readdirSync(mediaDir).filter((n) => /\.(jpg|jpeg|png|webp)$/i.test(n)).length;
+  } catch {
+  }
+  out.freedMB = Math.round(out.freedMB * 10) / 10;
+  return out;
+}
+
+// src/stores.ts
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "node:fs";
+import { join as join3 } from "node:path";
 var JsonStore = class {
   file;
   fallback;
@@ -523,16 +681,16 @@ var JsonStore = class {
   constructor(dir, name, fallback) {
     this.fallback = fallback;
     try {
-      if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+      if (!existsSync3(dir)) mkdirSync2(dir, { recursive: true });
     } catch {
     }
-    this.file = join(dir, name);
+    this.file = join3(dir, name);
   }
   read() {
     if (this.cached) return this.cached;
     try {
-      if (existsSync(this.file)) {
-        const raw = JSON.parse(readFileSync(this.file, "utf8"));
+      if (existsSync3(this.file)) {
+        const raw = JSON.parse(readFileSync3(this.file, "utf8"));
         this.cached = raw ?? this.fallback;
         return this.cached;
       }
@@ -544,7 +702,7 @@ var JsonStore = class {
   write(value) {
     this.cached = value;
     try {
-      writeFileSync(this.file, JSON.stringify(value, null, 2));
+      writeFileSync3(this.file, JSON.stringify(value, null, 2));
     } catch {
     }
   }
@@ -552,7 +710,7 @@ var JsonStore = class {
 
 // src/hands.ts
 import { execFile } from "node:child_process";
-import { readFileSync as readFileSync2 } from "node:fs";
+import { readFileSync as readFileSync4 } from "node:fs";
 import { get as httpGet, request as httpRequest } from "node:http";
 var ACTION_TIMEOUT_MS = 6e3;
 var PROBE_TTL_MS = 2e4;
@@ -562,12 +720,12 @@ var MAX_GESTURE_MS = 2e4;
 var HandError = class extends Error {
 };
 function get(port, path, timeoutMs) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     const req = httpGet({ host: "127.0.0.1", port, path, timeout: timeoutMs }, (res) => {
       const chunks = [];
       res.on("data", (chunk) => chunks.push(chunk));
       res.on("end", () => {
-        resolve({
+        resolve2({
           status: res.statusCode ?? 0,
           body: Buffer.concat(chunks),
           header: (name) => {
@@ -582,7 +740,7 @@ function get(port, path, timeoutMs) {
   });
 }
 async function post(port, path, body, timeoutMs) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     const data = Buffer.from(body, "utf8");
     const req = httpRequest(
       {
@@ -597,7 +755,7 @@ async function post(port, path, body, timeoutMs) {
         const chunks = [];
         res.on("data", (chunk) => chunks.push(chunk));
         res.on("end", () => {
-          resolve({
+          resolve2({
             status: res.statusCode ?? 0,
             body: Buffer.concat(chunks),
             header: (name) => {
@@ -690,10 +848,10 @@ var RootActuator = class {
     this.log = log;
   }
   run(argv, timeoutMs = ACTION_TIMEOUT_MS) {
-    return new Promise((resolve) => {
+    return new Promise((resolve2) => {
       execFile(argv[0], argv.slice(1), { timeout: timeoutMs, maxBuffer: 1 << 20 }, (err, stdout, stderr) => {
         const code = err ? typeof err.code === "number" ? err.code : 1 : 0;
-        resolve({ code, out: String(stdout ?? ""), err: String(stderr ?? "") });
+        resolve2({ code, out: String(stdout ?? ""), err: String(stderr ?? "") });
       });
     });
   }
@@ -739,10 +897,10 @@ var ShellActuator = class {
     if (!template) return { ok: false, detail: "shell \u901A\u9053\u6CA1\u914D\u6A21\u677F" };
     if (!template.includes("{cmd}")) return { ok: false, detail: "shell \u6A21\u677F\u91CC\u6CA1\u6709 {cmd}\uFF0C\u4E0D\u77E5\u9053\u628A\u547D\u4EE4\u653E\u54EA" };
     const probe = template.replace(/\{cmd\}/g, "id");
-    const r = await new Promise((resolve) => {
+    const r = await new Promise((resolve2) => {
       execFile("sh", ["-c", probe], { timeout: 8e3, maxBuffer: 1 << 20 }, (err, stdout, stderr) => {
         const code = err ? typeof err.code === "number" ? err.code : 1 : 0;
-        resolve({ code, out: String(stdout ?? ""), err: String(stderr ?? "") });
+        resolve2({ code, out: String(stdout ?? ""), err: String(stderr ?? "") });
       });
     });
     if (r.code !== 0) return { ok: false, detail: flat(r.err || r.out, 140) || "\u6A21\u677F\u8DD1\u4E0D\u8D77\u6765" };
@@ -751,10 +909,10 @@ var ShellActuator = class {
   }
   async apply(command) {
     const argv = this.argv(command);
-    const r = await new Promise((resolve) => {
+    const r = await new Promise((resolve2) => {
       execFile(argv[0], argv.slice(1), { timeout: ACTION_TIMEOUT_MS, maxBuffer: 1 << 20 }, (err, stdout, stderr) => {
         const code = err ? typeof err.code === "number" ? err.code : 1 : 0;
-        resolve({ code, out: String(stdout ?? ""), err: String(stderr ?? "") });
+        resolve2({ code, out: String(stdout ?? ""), err: String(stderr ?? "") });
       });
     });
     if (r.code !== 0) throw new HandError(`\u901A\u9053\u547D\u4EE4\u6CA1\u6210\u529F\uFF08${flat(r.err || r.out, 160) || `\u9000\u51FA\u7801 ${r.code}`}\uFF09\u3002`);
@@ -858,6 +1016,20 @@ var EyesClient = class {
     }
     return { ok: body.ok !== false, pkg: flat(body.pkg, 120), items };
   }
+  /** 只截一块并放大：x,y,w,h 是真实像素。 */
+  async zoom(x, y, w, h, maxWidth = 1080, quality = 80) {
+    const cfg = this.cfg();
+    const path = `/screen.jpg?x=${Math.max(0, Math.round(x))}&y=${Math.max(0, Math.round(y))}&w=${Math.max(8, Math.round(w))}&h=${Math.max(8, Math.round(h))}&max=${Math.round(maxWidth)}&q=${Math.round(quality)}`;
+    const res = await get(this.handPort(), path, 12e3);
+    if (res.status !== 200 || res.body.length === 0) return null;
+    return {
+      bytes: new Uint8Array(res.body),
+      width: Number.parseInt(res.header("x-width"), 10) || 0,
+      height: Number.parseInt(res.header("x-height"), 10) || 0,
+      pkg: "",
+      ageMs: 0
+    };
+  }
   async frame(maxWidth, quality) {
     try {
       const w = Math.max(160, Math.min(2160, Math.round(maxWidth)));
@@ -953,7 +1125,7 @@ var Hands = class {
     if (Date.now() - this.tokenCache.at < 3e4) return this.tokenCache.value;
     let value = "";
     try {
-      const text = readFileSync2(file, "utf8").trim();
+      const text = readFileSync4(file, "utf8").trim();
       if (text && text.length <= 200) value = text;
     } catch {
       value = "";
@@ -1964,6 +2136,21 @@ var HANDS_TOOL_DECLS = [
       },
       required: ["content"]
     }
+  },
+  {
+    name: "hand_zoom",
+    tags: ["read"],
+    description: "\u53EA\u622A\u5C4F\u5E55\u7684\u4E00\u5C0F\u5757\u5E76\u653E\u5927\u2014\u2014\u5C0F\u5B57\u3001\u5C0F\u6309\u94AE\u770B\u4E0D\u6E05\u65F6\u7528\u5B83\u3002\u5148 hand_see \u62FF\u5230\u5750\u6807\uFF0C\u518D\u628A\u8FD9\u5757\u7684 x/y/\u5BBD/\u9AD8 \u4EA4\u7ED9\u5B83\u3002",
+    parameters: {
+      type: "object",
+      properties: {
+        x: { type: "integer", description: "\u5DE6\u4E0A\u89D2\u6A2A\u5750\u6807\uFF08\u771F\u5B9E\u50CF\u7D20\uFF09" },
+        y: { type: "integer", description: "\u5DE6\u4E0A\u89D2\u7EB5\u5750\u6807" },
+        w: { type: "integer", description: "\u5BBD" },
+        h: { type: "integer", description: "\u9AD8" }
+      },
+      required: ["x", "y", "w", "h"]
+    }
   }
 ];
 
@@ -2085,8 +2272,8 @@ var HandsWorld = class {
     try {
       const old = readPersona(dir);
       const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").slice(0, 19);
-      if (old) writeFileSync2(join2(dir, `CONSTITUTION.bak.${stamp}.md`), old);
-      writeFileSync2(join2(dir, "CONSTITUTION.md"), content);
+      if (old) writeFileSync4(join4(dir, `CONSTITUTION.bak.${stamp}.md`), old);
+      writeFileSync4(join4(dir, "CONSTITUTION.md"), content);
       return `\u4EBA\u683C\u6362\u597D\u4E86\uFF08\u65E7\u7248\u5907\u4EFD\u6210 CONSTITUTION.bak.${stamp}.md\uFF09`;
     } catch (err) {
       return failed("\u5199\u4E0D\u8FDB\u53BB\uFF1A" + String(err).slice(0, 120));
@@ -2101,7 +2288,7 @@ var HandsWorld = class {
     try {
       const rows = await this.hands.memorySearch();
       lines = rows.length;
-      const target = join2(dir, "\u8BB0\u5FC6\u5E93.md");
+      const target = join4(dir, "\u8BB0\u5FC6\u5E93.md");
       const r = mergeMemorySection(target, rows);
       if (r.wrote) wrote.push("\u8BB0\u5FC6\u5E93.md");
       const persona = readPersona(dir);
@@ -2272,7 +2459,7 @@ ${lines.join("\n")}
   mediaDir() {
     const base = this.opts.dataDir;
     if (!base) return null;
-    const dir = base.endsWith("/data") ? join2(base, "media") : join2(base, "data", "media");
+    const dir = base.endsWith("/data") ? join4(base, "media") : join4(base, "data", "media");
     return dir;
   }
   /** 钩子 5：QQ 在后台收到的消息，原样递给她；谁来的一眼能看清。 */
@@ -2372,6 +2559,17 @@ ${lines.join("\n")}
           return await this.runSync(true);
         case "sync_status":
           return this.lastSync ? `\u4E0A\u6B21\u540C\u6B65 ${this.lastSync.at.slice(0, 19)}\uFF0C\u8BB0\u5FC6 ${this.lastSync.lines} \u6761\uFF0C\u4EBA\u683C ${this.lastSync.persona} \u5B57` : "\u8FD8\u6CA1\u540C\u6B65\u8FC7";
+        case "hand_zoom": {
+          const n = (v) => Math.round(Number(v));
+          const x = n(args.x), y = n(args.y), w = n(args.w), h = n(args.h);
+          if (![x, y, w, h].every(Number.isFinite) || w <= 0 || h <= 0) return failed("\u8981\u7ED9 x/y/w/h\uFF08\u771F\u5B9E\u50CF\u7D20\uFF09");
+          const f = await this.hands.zoom(x, y, w, h);
+          if (!f) return failed("\u8FD9\u4E00\u5757\u6CA1\u622A\u5230\uFF08\u5750\u6807\u53EF\u80FD\u8D85\u51FA\u5C4F\u5E55\uFF09");
+          return {
+            text: `\u653E\u5927\u770B @(${x},${y}) ${w}\xD7${h}`,
+            blobs: [{ bytes: f.bytes, mime: "image/jpeg", name: "zoom.jpg", fallbackText: "\uFF08\u8FD9\u662F\u4ED6\u6307\u5B9A\u90A3\u4E00\u5757\u653E\u5927\u540E\u7684\u622A\u56FE\uFF09" }]
+          };
+        }
         case "hand_see":
           return await this.see();
         case "hand_look":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cortico-world-hands",
-  "version": "0.20.2",
+  "version": "0.20.4",
   "type": "module",
   "description": "Cortico World: hands for the desktop pet — looks at the phone screen, then taps, swipes, pinches, drags, types and presses keys through whatever actuator the device actually has",
   "license": "MIT",