@llblab/pi-kit 0.22.2 → 0.23.1

package/node_modules/@llblab/pi-telegram/lib/skills.ts

@@ -4,26 +4,62 @@
  * Owns source-checkout skill contribution; installed packages use their manifest
  */
 
-import { extname } from "node:path";
+import { existsSync } from "node:fs";
+import { basename, dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 import type { ExtensionAPI } from "./pi.ts";
+import { resolveAgentDir } from "./paths.ts";
 
 const TELEGRAM_SKILLS_MODULE_PATH = fileURLToPath(import.meta.url);
 
-export const TELEGRAM_SKILLS_PATH = fileURLToPath(
-  new URL("../skills", import.meta.url),
+export function getTelegramExtensionPackageRoot(modulePath: string): string {
+  let current = dirname(modulePath);
+  while (true) {
+    if (existsSync(join(current, "package.json"))) {
+      const parent = dirname(current);
+      if (basename(current) === "dist" && existsSync(join(parent, "package.json"))) {
+        return parent;
+      }
+      return current;
+    }
+    const parent = dirname(current);
+    if (parent === current) return dirname(modulePath);
+    current = parent;
+  }
+}
+
+export interface TelegramRawExtensionCheckoutOptions {
+  agentDir?: string;
+  cwd?: string;
+}
+
+export function isRawTelegramExtensionCheckout(
+  modulePath: string,
+  options: TelegramRawExtensionCheckoutOptions = {},
+): boolean {
+  const packageRoot = resolve(getTelegramExtensionPackageRoot(modulePath));
+  const agentDir = resolve(options.agentDir ?? resolveAgentDir());
+  const cwd = resolve(options.cwd ?? process.cwd());
+  return dirname(packageRoot) === join(agentDir, "extensions") ||
+    dirname(packageRoot) === join(cwd, ".pi", "extensions");
+}
+
+export const TELEGRAM_SKILLS_PATH = join(
+  getTelegramExtensionPackageRoot(TELEGRAM_SKILLS_MODULE_PATH),
+  "skills",
 );
 
 export function registerTelegramSkillDiscovery(
   pi: Pick<ExtensionAPI, "on">,
   modulePath = TELEGRAM_SKILLS_MODULE_PATH,
+  options: TelegramRawExtensionCheckoutOptions = {},
 ): boolean {
-  // A raw source extension has no package manifest owner. Compiled npm/git
-  // packages do, so contributing again would bypass their resource filters.
-  if (extname(modulePath) !== ".ts") return false;
+  // Pi auto-discovers extension entrypoints but not their manifest Skills.
+  // Manifest-loaded packages own Skills and filters through `pi.skills`.
+  if (!isRawTelegramExtensionCheckout(modulePath, options)) return false;
   pi.on("resources_discover", () => ({
-    skillPaths: [TELEGRAM_SKILLS_PATH],
+    skillPaths: [join(getTelegramExtensionPackageRoot(modulePath), "skills")],
   }));
   return true;
 }

package/node_modules/@llblab/pi-telegram/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llblab/pi-telegram",
-  "version": "0.51.3",
+  "version": "0.51.4",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -31,12 +31,13 @@
     "test:verbose": "node --experimental-strip-types --test --test-reporter=spec tests/*.test.ts",
     "typecheck": "tsc --noEmit",
     "build": "node scripts/build-dist.mjs",
+    "build:check": "node scripts/build-dist.mjs --check",
     "prepack": "npm run build",
     "check": "node -e \"await import('./dist/pi-telegram/index.js'); console.log('pi-telegram: extension import ok')\"",
     "audit": "npm audit --omit=peer",
     "audit:host": "npm audit",
     "pack:check": "npm pack --dry-run",
-    "validate": "npm run build && npm run typecheck && npm test && npm run audit && npm run check && npm run pack:check"
+    "validate": "npm run build:check && npm run typecheck && npm test && npm run audit && npm run check && npm run pack:check"
   },
   "files": [
     "index.ts",
@@ -102,15 +103,9 @@
     "extensions": [
       "./dist/pi-telegram/index.js"
     ],
-    "sourceExtensions": [
-      "./index.ts"
-    ],
     "skills": [
       "./dist/skills"
     ],
-    "sourceSkills": [
-      "./skills"
-    ],
     "image": "https://raw.githubusercontent.com/llblab/pi-telegram/main/screenshot.png"
   },
   "peerDependencies": {

package/node_modules/@llblab/pi-telegram/scripts/build-dist.mjs

@@ -1,44 +1,115 @@
 #!/usr/bin/env node
 
 /**
- * Builds the distributive JavaScript, declarations, Pi entrypoint, and Skills.
- * Usage: node scripts/build-dist.mjs
- *
- * The build replaces `dist`, compiles with `tsconfig.build.json`, then copies
- * package-owned runtime assets. It does not publish, pack, or modify sources.
+ * Builds or verifies the distributive JavaScript, declarations, Pi entrypoint,
+ * Skills, and runtime assets without exposing a partial tree.
  */
 
 import { spawnSync } from "node:child_process";
-import { cpSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
+import {
+  cpSync,
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  readdirSync,
+  renameSync,
+  rmSync,
+  writeFileSync,
+} from "node:fs";
+import { join, relative } from "node:path";
+
+const DIST_DIR = "dist";
+const checkOnly = process.argv.includes("--check");
 
 function run(command, args) {
   const result = spawnSync(command, args, { stdio: "inherit" });
   if (result.error) throw result.error;
-  if (result.status !== 0) process.exit(result.status ?? 1);
+  if (result.status !== 0) {
+    throw new Error(`${command} exited with status ${result.status ?? "unknown"}.`);
+  }
+}
+
+function listFiles(root, current = root) {
+  return readdirSync(current, { withFileTypes: true }).flatMap((entry) => {
+    const path = join(current, entry.name);
+    return entry.isDirectory() ? listFiles(root, path) : [relative(root, path)];
+  }).sort();
+}
+
+function normalizeTextFiles(root) {
+  const textSuffixes = [".js", ".ts", ".mjs", ".json", ".md"];
+  for (const path of listFiles(root)) {
+    if (!textSuffixes.some((suffix) => path.endsWith(suffix))) continue;
+    const absolutePath = join(root, path);
+    const source = readFileSync(absolutePath, "utf8");
+    const normalized = source.replace(/\r\n?/g, "\n");
+    if (normalized !== source) writeFileSync(absolutePath, normalized, "utf8");
+  }
+}
+
+function assertTreesEqual(expectedRoot, actualRoot) {
+  if (!existsSync(expectedRoot)) {
+    throw new Error(`${expectedRoot} is missing; run npm run build.`);
+  }
+  const expectedFiles = listFiles(expectedRoot);
+  const actualFiles = listFiles(actualRoot);
+  if (JSON.stringify(expectedFiles) !== JSON.stringify(actualFiles)) {
+    throw new Error("dist file inventory is stale; run npm run build.");
+  }
+  for (const path of expectedFiles) {
+    if (!readFileSync(join(expectedRoot, path)).equals(readFileSync(join(actualRoot, path)))) {
+      throw new Error(`dist/${path} is stale; run npm run build.`);
+    }
+  }
+}
+
+function replaceDist(candidate) {
+  const backup = `.dist-backup-${process.pid}-${Date.now()}`;
+  const hadDist = existsSync(DIST_DIR);
+  if (hadDist) renameSync(DIST_DIR, backup);
+  try {
+    renameSync(candidate, DIST_DIR);
+    if (hadDist) rmSync(backup, { recursive: true, force: true });
+  } catch (error) {
+    if (hadDist && existsSync(backup) && !existsSync(DIST_DIR)) {
+      renameSync(backup, DIST_DIR);
+    }
+    throw error;
+  }
 }
 
-rmSync("dist", { recursive: true, force: true });
-mkdirSync("dist", { recursive: true });
-
-run(process.execPath, [
-  join("node_modules", "typescript", "bin", "tsc"),
-  "-p",
-  "tsconfig.build.json",
-]);
-
-mkdirSync(join("dist", "pi-telegram"), { recursive: true });
-writeFileSync(
-  join("dist", "pi-telegram", "index.js"),
-  'export { default } from "../index.js";\n',
-  "utf8",
-);
-
-cpSync("skills", join("dist", "skills"), { recursive: true });
-cpSync("package.json", join("dist", "package.json"));
-cpSync(
-  join("lib", "generative-app-worker.mjs"),
-  join("dist", "lib", "generative-app-worker.mjs"),
-);
-
-run(process.execPath, ["--check", join("dist", "pi-telegram", "index.js")]);
+const candidate = mkdtempSync(join(process.cwd(), ".dist-build-"));
+try {
+  run(process.execPath, [
+    join("node_modules", "typescript", "bin", "tsc"),
+    "-p",
+    "tsconfig.build.json",
+    "--outDir",
+    candidate,
+  ]);
+
+  mkdirSync(join(candidate, "pi-telegram"), { recursive: true });
+  writeFileSync(
+    join(candidate, "pi-telegram", "index.js"),
+    'export { default } from "../index.js";\n',
+    "utf8",
+  );
+  normalizeTextFiles(candidate);
+  cpSync("skills", join(candidate, "skills"), { recursive: true });
+  cpSync("package.json", join(candidate, "package.json"));
+  cpSync(
+    join("lib", "generative-app-worker.mjs"),
+    join(candidate, "lib", "generative-app-worker.mjs"),
+  );
+  run(process.execPath, ["--check", join(candidate, "pi-telegram", "index.js")]);
+
+  if (checkOnly) {
+    assertTreesEqual(DIST_DIR, candidate);
+    console.log("pi-telegram: dist is current");
+  } else {
+    replaceDist(candidate);
+  }
+} finally {
+  rmSync(candidate, { recursive: true, force: true });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llblab/pi-kit",
-  "version": "0.22.2",
+  "version": "0.23.1",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -40,12 +40,12 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@llblab/pi-actors": "0.53.0",
+    "@llblab/pi-actors": "0.53.2",
     "@llblab/pi-clean-room": "0.2.0",
     "@llblab/pi-codex-usage": "0.10.0",
-    "@llblab/pi-grow-loop": "0.8.1",
-    "@llblab/pi-state-flow": "0.18.1",
-    "@llblab/pi-telegram": "0.51.3",
+    "@llblab/pi-grow-loop": "0.8.2",
+    "@llblab/pi-state-flow": "0.19.0",
+    "@llblab/pi-telegram": "0.51.4",
     "@llblab/skills": "1.15.0"
   },
   "bundledDependencies": [
@@ -62,13 +62,13 @@
       "./node_modules/@llblab/pi-actors/dist/pi-actors/index.js",
       "./node_modules/@llblab/pi-clean-room/index.ts",
       "./node_modules/@llblab/pi-codex-usage/index.ts",
-      "./node_modules/@llblab/pi-grow-loop/index.ts",
+      "./node_modules/@llblab/pi-grow-loop/dist/pi-grow-loop/index.js",
       "./node_modules/@llblab/pi-state-flow/dist/pi-state-flow/index.js",
       "./node_modules/@llblab/pi-telegram/dist/pi-telegram/index.js"
     ],
     "skills": [
       "./node_modules/@llblab/pi-actors/dist/skills",
-      "./node_modules/@llblab/pi-grow-loop/skills",
+      "./node_modules/@llblab/pi-grow-loop/dist/skills",
       "./node_modules/@llblab/pi-state-flow/dist/skills",
       "./node_modules/@llblab/pi-telegram/dist/skills",
       "./node_modules/@llblab/skills/"