@s2script/sdk 0.21.0 → 0.23.0

package/dist/cli.js

@@ -3126,8 +3126,8 @@ var sharedCompilerOptionsJson = {
   noEmit: true,
   moduleResolution: "bundler",
   module: "ESNext",
-  target: "ES2020",
-  lib: ["ES2020"],
+  target: "ES2024",
+  lib: ["ES2024"],
   types: [],
   skipLibCheck: true,
   allowImportingTsExtensions: true
@@ -3139,7 +3139,7 @@ function sharedProgramOptions(tsMod) {
     allowImportingTsExtensions: sharedCompilerOptionsJson.allowImportingTsExtensions,
     moduleResolution: tsMod.ModuleResolutionKind.Bundler,
     module: tsMod.ModuleKind.ESNext,
-    target: tsMod.ScriptTarget.ES2020,
+    target: tsMod.ScriptTarget.ES2024,
     lib: sharedCompilerOptionsJson.lib.map((l2) => `lib.${l2.toLowerCase()}.d.ts`),
     types: [...sharedCompilerOptionsJson.types],
     skipLibCheck: sharedCompilerOptionsJson.skipLibCheck
@@ -3766,8 +3766,12 @@ function localDeclarationFiles(pluginDir) {
   return readdirSync2(srcDir).filter((f) => f.endsWith(".d.ts")).map((f) => join7(srcDir, f));
 }
 function generatedDeclarationFiles(pluginDir) {
-  const gd = join7(pluginDir, ".s2script", "gamedata.d.ts");
-  return existsSync6(gd) ? [gd] : [];
+  const out = [];
+  for (const name of ["gamedata.d.ts", "hooks.d.ts"]) {
+    const p = join7(pluginDir, ".s2script", name);
+    if (existsSync6(p)) out.push(p);
+  }
+  return out;
 }
 function gamePackageDeclarationFiles(pkg, packagesDir) {
   const deps = { ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} };
@@ -3791,7 +3795,7 @@ function typecheckPlugin(pluginDir, opts) {
   const entryRel = s2.main ?? pkg.main;
   if (!entryRel) throw new Error(`typecheckPlugin: no entry point in ${join7(absDir, "package.json")}`);
   const entry = resolve6(absDir, entryRel);
-  const isAlwaysResolved = (d) => d.startsWith("@s2script/sdk/") || d === "@s2script/cs2" || d.startsWith("@s2script/cs2/");
+  const isAlwaysResolved = (d) => d === "@s2script/sdk" || d.startsWith("@s2script/sdk/") || d === "@s2script/cs2" || d.startsWith("@s2script/cs2/");
   const localDts = localDeclarationFiles(absDir);
   const locallyDeclared = declaredModules(localDts);
   const allDeclaredDeps = [
@@ -3825,10 +3829,12 @@ function typecheckPlugin(pluginDir, opts) {
     ...sharedProgramOptions(ts),
     baseUrl: packagesDir,
     paths: {
-      // Builtins are `@s2script/sdk/<cap>` → packages/sdk/<cap>.d.ts. The `@s2script/*` fallback
-      // now serves only @s2script/cs2 → packages/cs2/index.d.ts (the legacy per-package builtin
-      // dirs are deleted). tsc picks the longest matching prefix, so `@s2script/sdk/*` wins for
-      // sdk imports.
+      // Builtins: the root barrel `@s2script/sdk` → packages/sdk/index.d.ts; subpaths
+      // `@s2script/sdk/<cap>` → packages/sdk/<cap>.d.ts. The `@s2script/*` fallback serves
+      // @s2script/cs2 → packages/cs2/index.d.ts (and would also hit sdk/index.d.ts; the exact
+      // `@s2script/sdk` entry makes the barrel obvious). tsc picks the longest matching prefix,
+      // so `@s2script/sdk/*` wins for capability imports.
+      "@s2script/sdk": ["sdk/index.d.ts"],
       "@s2script/sdk/*": ["sdk/*.d.ts"],
       // Game-package SUBPATHS (e.g. @s2script/cs2/econ -> packages/cs2/econ.d.ts). Needed because
       // the `@s2script/*` fallback below maps to `<pkg>/index.d.ts`, which cannot express a
@@ -4167,31 +4173,60 @@ function isPluginContext(type) {
   const sym = type.getSymbol() ?? type.aliasSymbol;
   return sym?.getName() === "PluginContext";
 }
+function isFromPluginDts(checker, node) {
+  let sym = checker.getSymbolAtLocation(node);
+  if (sym === void 0) return false;
+  if (sym.flags & ts2.SymbolFlags.Alias) {
+    const aliased = checker.getAliasedSymbol(sym);
+    if (aliased !== void 0) sym = aliased;
+  }
+  for (const d of sym.declarations ?? []) {
+    const f = d.getSourceFile().fileName.replace(/\\/g, "/");
+    if (f.endsWith("/plugin.d.ts")) return true;
+  }
+  return false;
+}
+function recordPublishOrUse(out, method, arg0, sf, node) {
+  if (method === "publish") {
+    if (arg0 !== void 0 && ts2.isStringLiteralLike(arg0)) {
+      out.publishNames.push(arg0.text);
+    } else {
+      const { line } = sf.getLineAndCharacterOfPosition(node.getStart());
+      out.dynamicPublishSites.push(`${sf.fileName}:${line + 1}`);
+    }
+  } else if (arg0 !== void 0 && ts2.isStringLiteralLike(arg0)) {
+    out.useNames.push(arg0.text);
+  }
+}
+function recordImportSpecifier(out, spec) {
+  if (spec.startsWith(".") || spec.startsWith("@s2script/")) return;
+  out.importNames.push(spec);
+}
 function scanPluginProgram(program, pluginDir) {
   const checker = program.getTypeChecker();
-  const out = { publishNames: [], dynamicPublishSites: [], useNames: [] };
+  const out = { publishNames: [], dynamicPublishSites: [], useNames: [], importNames: [] };
   const dirPrefix = pluginDir.replace(/\\/g, "/").replace(/\/+$/, "") + "/";
   for (const sf of program.getSourceFiles()) {
     if (sf.isDeclarationFile) continue;
     if (!sf.fileName.replace(/\\/g, "/").startsWith(dirPrefix)) continue;
     const visit = (node) => {
-      if (ts2.isCallExpression(node) && ts2.isPropertyAccessExpression(node.expression)) {
-        const method = node.expression.name.text;
-        if (method === "publish" || method === "use" || method === "tryUse") {
-          const recv = checker.getTypeAtLocation(node.expression.expression);
-          if (isPluginContext(recv)) {
-            const arg0 = node.arguments[0];
-            if (method === "publish") {
-              if (arg0 !== void 0 && ts2.isStringLiteralLike(arg0)) {
-                out.publishNames.push(arg0.text);
-              } else {
-                const { line } = sf.getLineAndCharacterOfPosition(node.getStart());
-                out.dynamicPublishSites.push(`${sf.fileName}:${line + 1}`);
-              }
-            } else if (arg0 !== void 0 && ts2.isStringLiteralLike(arg0)) {
-              out.useNames.push(arg0.text);
+      if ((ts2.isImportDeclaration(node) || ts2.isExportDeclaration(node)) && node.moduleSpecifier !== void 0 && ts2.isStringLiteralLike(node.moduleSpecifier)) {
+        recordImportSpecifier(out, node.moduleSpecifier.text);
+      }
+      if (ts2.isCallExpression(node)) {
+        if (ts2.isPropertyAccessExpression(node.expression)) {
+          const method = node.expression.name.text;
+          if (method === "publish" || method === "use" || method === "tryUse") {
+            const recv = checker.getTypeAtLocation(node.expression.expression);
+            if (isPluginContext(recv)) {
+              recordPublishOrUse(out, method, node.arguments[0], sf, node);
             }
           }
+        } else if (ts2.isIdentifier(node.expression)) {
+          const name = node.expression.text;
+          if ((name === "publish" || name === "use" || name === "tryUse") && isFromPluginDts(checker, node.expression)) {
+            recordPublishOrUse(out, name, node.arguments[0], sf, node);
+          }
         }
       }
       ts2.forEachChild(node, visit);
@@ -4200,30 +4235,37 @@ function scanPluginProgram(program, pluginDir) {
   }
   out.publishNames = [...new Set(out.publishNames)];
   out.useNames = [...new Set(out.useNames)];
+  out.importNames = [...new Set(out.importNames)];
   return out;
 }
 
 // src/gamedata/types.ts
 var PLATFORM = "linuxsteamrt64";
-var ARG_KINDS = ["bool", "int", "float", "string", "vector", "entity"];
+var ARG_KINDS = ["bool", "int", "float", "string", "utlstring", "vector", "entity"];
 var RET_KINDS = ["void", "bool", "int", "float", "entity"];
-var INT_CLASS_ARGS = /* @__PURE__ */ new Set(["bool", "int", "string", "vector", "entity"]);
+var INT_CLASS_ARGS = /* @__PURE__ */ new Set(["bool", "int", "string", "utlstring", "vector", "entity"]);
 var MAX_INT_ARGS = 9;
 var MAX_FLOAT_ARGS = 8;
+var HOOK_SHAPES = ["this_void", "this_f32_i32_i32_i32", "this_f32_i32_i64_i64", "this_i64_i32_i64", "this_i64_i64_i64"];
+function hookShapeArity(shape) {
+  if (!HOOK_SHAPES.includes(shape)) return void 0;
+  if (shape === "this_void") return 0;
+  return shape.slice("this_".length).split("_").length;
+}
 
 // src/gamedata/validate.ts
-var ALLOWED_SECTIONS = /* @__PURE__ */ new Set(["signatures", "calls"]);
+var ALLOWED_SECTIONS = /* @__PURE__ */ new Set(["signatures", "calls", "hooks"]);
 var IDENTIFIER = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
 var RESERVED_CALL_NAMES = /* @__PURE__ */ new Set(["constructor", "prototype", "__proto__"]);
 var RESOLVE_KINDS = ["direct", "ctor-body-xref", "lea-disp"];
-var KNOWN_PERMISSIONS = ["engine:calls"];
+var KNOWN_PERMISSIONS = ["engine:calls", "engine:hooks"];
 function validatePluginGamedata(gd, opts) {
   const errs = [];
   if (gd == null || typeof gd !== "object" || Array.isArray(gd)) return ["gamedata must be an object"];
   const g = gd;
   for (const key of Object.keys(g)) {
     if (!ALLOWED_SECTIONS.has(key)) {
-      errs.push(`gamedata section '${key}' is not supported in v1 (allowed: signatures, calls)`);
+      errs.push(`gamedata section '${key}' is not supported in v1 (allowed: signatures, calls, hooks)`);
     }
   }
   const sigs = g.signatures ?? {};
@@ -4358,8 +4400,249 @@ function validatePluginGamedata(gd, opts) {
       errs.push(`${where2}: 'returns' must be one of ${RET_KINDS.join(", ")}`);
     }
   }
+  validateHooks(g, sigs, callNames, opts.permissions, errs);
   return errs;
 }
+function isNonEmptyObject(v) {
+  return v != null && typeof v === "object" && !Array.isArray(v) && Object.keys(v).length > 0;
+}
+function validateHooks(g, sigs, callNames, permissions, errs) {
+  if (g.hooks === void 0) return;
+  if (g.hooks == null || typeof g.hooks !== "object" || Array.isArray(g.hooks)) {
+    errs.push("hooks must be an object");
+    return;
+  }
+  const hooks = g.hooks;
+  const hookNames = Object.keys(hooks);
+  if (hookNames.length && !permissions.includes("engine:hooks")) {
+    errs.push('gamedata declares a `hooks` section but the manifest does not declare permission "engine:hooks"');
+  }
+  for (const [name, rawDecl] of Object.entries(hooks)) {
+    const where2 = `hook '${name}'`;
+    if (!IDENTIFIER.test(name)) {
+      errs.push(
+        `${where2}: hook name must be a plain identifier matching ${IDENTIFIER.source} \u2014 it is emitted verbatim as a TypeScript interface member in the generated .s2script/hooks.d.ts`
+      );
+      continue;
+    }
+    if (RESERVED_CALL_NAMES.has(name)) {
+      errs.push(`${where2}: hook name '${name}' is reserved`);
+      continue;
+    }
+    if (rawDecl == null || typeof rawDecl !== "object" || Array.isArray(rawDecl)) {
+      errs.push(`${where2}: must be an object`);
+      continue;
+    }
+    const decl = rawDecl;
+    const ctx = decl.expose?.ctx;
+    if (typeof ctx !== "string" || !ctx.length) {
+      errs.push(`${where2}: missing 'expose.ctx' \u2014 nothing could subscribe to this hook`);
+    } else if (!IDENTIFIER.test(ctx)) {
+      errs.push(`${where2}: 'expose.ctx' must be a plain identifier, got ${JSON.stringify(ctx)}`);
+    }
+    const shape = decl.shape;
+    if (typeof shape !== "string" || !HOOK_SHAPES.includes(shape)) {
+      errs.push(
+        `${where2}: unknown hook shape ${JSON.stringify(shape)} (this build compiles thunks for: ${HOOK_SHAPES.join(", ")})`
+      );
+    }
+    const params = decl.params ?? [];
+    if (!Array.isArray(params)) {
+      errs.push(`${where2}: 'params' must be an array`);
+    } else {
+      const seen = /* @__PURE__ */ new Set();
+      for (let i2 = 0; i2 < params.length; i2++) {
+        const p = params[i2];
+        if (typeof p !== "string" || !IDENTIFIER.test(p)) {
+          errs.push(`${where2}: params[${i2}] = ${JSON.stringify(p)} must be a plain identifier`);
+          continue;
+        }
+        if (seen.has(p)) errs.push(`${where2}: param name ${JSON.stringify(p)} is declared more than once`);
+        seen.add(p);
+      }
+      const arity = typeof shape === "string" ? hookShapeArity(shape) : void 0;
+      if (arity !== void 0 && params.length > arity) {
+        errs.push(
+          `${where2}: declares ${params.length} 'params' but shape ${JSON.stringify(shape)} passes only ${arity}`
+        );
+      }
+      if (decl.mutable !== void 0) {
+        const mutable = decl.mutable;
+        if (!Array.isArray(mutable)) {
+          errs.push(`${where2}: 'mutable' must be an array`);
+        } else {
+          for (const m of mutable) {
+            if (typeof m !== "string" || !params.includes(m)) {
+              errs.push(`${where2}: 'mutable' names ${JSON.stringify(m)}, which is not one of this hook's params`);
+            }
+          }
+        }
+      }
+    }
+    const recv = decl.receiver;
+    if (recv !== void 0) {
+      if (recv == null || typeof recv !== "object") {
+        errs.push(`${where2}: 'receiver' must be an object`);
+      } else {
+        const rkind = recv.kind ?? "none";
+        if (rkind !== "none" && rkind !== "entity") {
+          errs.push(`${where2}: receiver.kind must be "none" or "entity"`);
+        } else if (rkind === "entity") {
+          if (typeof recv.as !== "string" || !IDENTIFIER.test(recv.as)) {
+            errs.push(`${where2}: receiver.kind "entity" needs a plain-identifier 'as' name`);
+          } else if (Array.isArray(params) && params.includes(recv.as)) {
+            errs.push(`${where2}: receiver 'as' name ${JSON.stringify(recv.as)} collides with a param name`);
+          }
+        }
+      }
+    }
+    if (decl.bypassWith !== void 0) {
+      if (typeof decl.bypassWith !== "string" || !decl.bypassWith.length) {
+        errs.push(`${where2}: 'bypassWith' must be a non-empty call name`);
+      } else if (!callNames.includes(decl.bypassWith)) {
+        errs.push(
+          `${where2}: 'bypassWith' names ${JSON.stringify(decl.bypassWith)}, which is not a 'calls' descriptor in this owner's gamedata`
+        );
+      }
+    }
+    const target = decl.target;
+    if (!target) {
+      errs.push(`${where2}: missing 'target'`);
+      continue;
+    }
+    if (target.kind === "signature") {
+      if (typeof target.name !== "string") {
+        errs.push(`${where2}: target.name must be a string`);
+      } else if (!(target.name in sigs)) {
+        errs.push(`${where2}: target.name '${target.name}' has no entry in 'signatures'`);
+      }
+      const sigPlat = typeof target.name === "string" ? sigs[target.name]?.[PLATFORM] : void 0;
+      const inherited = sigPlat?.validate;
+      if (!isNonEmptyObject(target.validate) && !isNonEmptyObject(inherited)) {
+        errs.push(
+          `${where2}: a hook target MUST carry a non-empty 'validate' (inline, or inherited from its named signature) \u2014 a wrong detour address overwrites the prologue of whatever is actually there`
+        );
+      }
+    } else if (target.kind === "vtable") {
+      if (typeof target.class !== "string") errs.push(`${where2}: vtable target requires 'class'`);
+      const plat = target[PLATFORM];
+      if (!plat) {
+        errs.push(`${where2}: vtable target missing platform '${PLATFORM}'`);
+      } else {
+        if (!Number.isInteger(plat.index) || plat.index < 0) {
+          errs.push(`${where2}: vtable index must be a non-negative integer`);
+        }
+        const prologue = plat.validate?.prologue;
+        if (typeof prologue !== "string" || !prologue.length) {
+          errs.push(`${where2}: a vtable target REQUIRES validate.prologue (a bare borrowed index is never trusted)`);
+        }
+      }
+    } else {
+      errs.push(`${where2}: target.kind must be "signature" or "vtable"`);
+    }
+  }
+}
+
+// src/hookgen/model.ts
+function capitalize(name) {
+  return name.length === 0 ? name : name.charAt(0).toUpperCase() + name.slice(1);
+}
+function hookDescriptor(name, decl) {
+  const paramNames = decl.params ?? [];
+  const mutableSet = new Set(decl.mutable ?? []);
+  const params = paramNames.map((p) => ({ name: p, mutable: mutableSet.has(p) }));
+  const receiverAs = decl.receiver?.kind === "entity" ? decl.receiver.as ?? null : null;
+  return { name, shape: decl.shape ?? "", viewIface: `${capitalize(name)}View`, params, receiverAs };
+}
+function buildPluginHookList(hooks) {
+  return Object.keys(hooks).sort().map((name) => hookDescriptor(name, hooks[name] ?? {}));
+}
+function buildHookModel(hooks) {
+  const byNs = /* @__PURE__ */ new Map();
+  for (const name of Object.keys(hooks).sort()) {
+    const decl = hooks[name] ?? {};
+    const ns = decl.expose?.ctx;
+    if (!ns) continue;
+    if (decl.expose?.handwritten) continue;
+    const list = byNs.get(ns) ?? [];
+    list.push(hookDescriptor(name, decl));
+    byNs.set(ns, list);
+  }
+  return Array.from(byNs.keys()).sort().map((ns) => ({ ns, ctxIface: `Ctx${capitalize(ns)}`, hooks: byNs.get(ns) }));
+}
+
+// src/hookgen/emit-dts.ts
+var HEADER = "// GENERATED by `s2script gen-hooks` from gamedata/cs2/game.cs2.jsonc's `hooks` \u2014 DO NOT EDIT.";
+var STRING_PARAMS = {
+  this_i64_i64_i64: /* @__PURE__ */ new Set([0])
+};
+function emitViewIface(h2) {
+  const out = [`export interface ${h2.viewIface} {`];
+  const strings = STRING_PARAMS[h2.shape] ?? /* @__PURE__ */ new Set();
+  h2.params.forEach((p, i2) => {
+    const mod = p.mutable ? "" : "readonly ";
+    out.push(`  ${mod}${p.name}: ${strings.has(i2) ? "string" : "number"};`);
+  });
+  if (h2.receiverAs !== null) {
+    out.push(`  readonly ${h2.receiverAs}: EntityRef | null;`);
+  }
+  out.push("}", "");
+  return out;
+}
+function emitHookDts(model) {
+  const out = [
+    HEADER,
+    'import type { HookResultValue } from "@s2script/sdk/events";',
+    'import type { EntityRef } from "@s2script/sdk/entity";',
+    ""
+  ];
+  for (const { hooks } of model) {
+    for (const h2 of hooks) {
+      out.push(...emitViewIface(h2));
+    }
+  }
+  for (const { ctxIface, hooks, ns } of model) {
+    out.push(`export interface ${ctxIface} {`);
+    for (const h2 of hooks) {
+      out.push(`  ${h2.name}(handler: (view: ${h2.viewIface}) => HookResultValue | void): void;`);
+    }
+    out.push("}", "");
+    out.push(`export declare const ${ns}: ${ctxIface};`);
+    out.push("");
+  }
+  out.push('declare module "@s2script/sdk/plugin" {');
+  out.push("  interface PluginContext {");
+  for (const { ns, ctxIface } of model) {
+    out.push(`    readonly ${ns}: ${ctxIface};`);
+  }
+  out.push("  }");
+  out.push("}");
+  return out.join("\n") + "\n";
+}
+var PLUGIN_HEADER = "// GENERATED by `s2s build` from the plugin's gamedata \u2014 DO NOT EDIT.";
+function emitPluginHookDts(hooks) {
+  const list = buildPluginHookList(hooks);
+  const out = [
+    PLUGIN_HEADER,
+    "// The EntityRef / HookResultValue imports are REQUIRED: a `declare module` augmentation",
+    "// resolves type names in its own file scope.",
+    'import type { HookResultValue } from "@s2script/sdk/events";',
+    'import type { EntityRef } from "@s2script/sdk/entity";',
+    ""
+  ];
+  for (const h2 of list) {
+    out.push(...emitViewIface(h2));
+  }
+  out.push('declare module "@s2script/sdk/unsafe" {');
+  out.push("  interface EngineHooks {");
+  for (const h2 of list) {
+    out.push(`    ${h2.name}: (handler: (view: ${h2.viewIface}) => HookResultValue | void) => void;`);
+  }
+  out.push("  }");
+  out.push("}");
+  out.push("");
+  return out.join("\n");
+}
 
 // src/gamedata/gen-types.ts
 var VECTOR_TS = "{ readonly x: number; readonly y: number; readonly z: number }";
@@ -4368,6 +4651,7 @@ var ARG_TS = {
   int: "number",
   float: "number",
   string: "string",
+  utlstring: "string",
   vector: VECTOR_TS,
   entity: "EntityRef | null"
 };
@@ -4405,6 +4689,9 @@ ${lines.join("\n")}
     ""
   ].join("\n");
 }
+function generateHookTypes(gd) {
+  return emitPluginHookDts(gd.hooks ?? {});
+}
 
 // src/gamedata/jsonc.ts
 function stripJsonComments(src) {
@@ -4514,8 +4801,14 @@ async function buildPlugin(dir, packagesDir) {
     const genDir = join11(absDir, ".s2script");
     mkdirSync2(genDir, { recursive: true });
     writeFileSync3(join11(genDir, "gamedata.d.ts"), generateGamedataTypes(gamedata));
+    if (gamedata.hooks && Object.keys(gamedata.hooks).length) {
+      writeFileSync3(join11(genDir, "hooks.d.ts"), generateHookTypes(gamedata));
+    } else {
+      rmSync2(join11(genDir, "hooks.d.ts"), { force: true });
+    }
   } else {
     rmSync2(join11(absDir, ".s2script", "gamedata.d.ts"), { force: true });
+    rmSync2(join11(absDir, ".s2script", "hooks.d.ts"), { force: true });
   }
   const declaredDepNames = [
     ...Object.keys(s2.pluginDependencies ?? {}),
@@ -4578,13 +4871,16 @@ ${lint.output}`);
   for (const used of scan.useNames) {
     if (!declaredDeps.has(used)) {
       console.warn(
-        `WARN: ctx.use/tryUse(${JSON.stringify(used)}) is not declared under s2script.pluginDependencies/optionalPluginDependencies \u2014 it will throw at runtime`
+        `WARN: use()/tryUse(${JSON.stringify(used)}) is not declared under s2script.pluginDependencies/optionalPluginDependencies \u2014 it will throw at runtime`
       );
     }
   }
+  const referenced = /* @__PURE__ */ new Set([...scan.useNames, ...scan.importNames]);
   for (const dep of declaredDeps) {
-    if (!scan.useNames.includes(dep)) {
-      console.warn(`WARN: dependency ${JSON.stringify(dep)} is declared but never ctx.use()d`);
+    if (!referenced.has(dep)) {
+      console.warn(
+        `WARN: dependency ${JSON.stringify(dep)} is declared but never ctx.use()d or imported`
+      );
     }
   }
   const { name, version } = pkg;
@@ -4612,7 +4908,7 @@ ${lint.output}`);
     platform: "neutral",
     format: "cjs",
     external,
-    target: "es2020",
+    target: "es2024",
     // platform:"neutral" defaults mainFields to EMPTY, so a workspace-sibling package that
     // declares `main` (rather than `exports`) fails to resolve with an undiagnosable error.
     // Set it explicitly so a monorepo plugin bundles whichever field the author wrote.
@@ -7812,29 +8108,33 @@ function fileDevDeps(packagesDir, game) {
 }
 function pluginSource(game) {
   if (game === "cs2") {
-    return `import { plugin } from "@s2script/sdk/plugin";
-import { Chat } from "@s2script/sdk/chat";
+    return `import { command, Chat, HookResult } from "@s2script/sdk";
+import type { Command, HookResultValue } from "@s2script/sdk";
 
-export default plugin((ctx) => {
-  ctx.commands.register("hello", (cmd) => {
-    cmd.reply("hello from s2script");
-    if (cmd.callerSlot >= 0) {
-      Chat.toSlot(cmd.callerSlot, "hello from s2script");
-    }
-  });
-});
+export function OnPluginStart(): void {
+  command("hello", hello);
+}
+
+function hello(cmd: Command): HookResultValue {
+  cmd.reply("hello from s2script");
+  if (cmd.callerSlot >= 0) {
+    Chat.toSlot(cmd.callerSlot, "hello from s2script");
+  }
+  return HookResult.Handled;
+}
 `;
   }
-  return `import { plugin } from "@s2script/sdk/plugin";
-import { delay } from "@s2script/sdk/timers";
+  return `import { delay } from "@s2script/sdk";
 
-export default plugin((ctx) => {
-  let n = 0;
-  ctx.server.onGameFrame(() => {
-    n += 1;
-  });
+let n = 0;
+
+export function OnPluginStart(): void {
   void delay(1000).then(() => console.log("s2script plugin alive; frames so far:", n));
-});
+}
+
+export function OnGameFrame(): void {
+  n += 1;
+}
 `;
 }
 var LIBRARY_ENTRY = `/** Encode a string. Replace this with the library's real surface. */
@@ -8837,7 +9137,7 @@ function buildModel(catalog, requested, embeddable = [], enumCatalog = {}) {
 }
 
 // src/schemagen/emit-dts.ts
-var HEADER = "// GENERATED by `s2script gen-schema` from schema-catalog.json \u2014 DO NOT EDIT.";
+var HEADER2 = "// GENERATED by `s2script gen-schema` from schema-catalog.json \u2014 DO NOT EDIT.";
 function emitDts(model) {
   const enumTs = new Map(model.enums.map((e) => [e.className, e.tsName]));
   const tsType = (f) => {
@@ -8845,7 +9145,7 @@ function emitDts(model) {
     return id ? `${id} | null` : TSTYPE[f.accessorKind];
   };
   const names = new Set(model.classes.map((c2) => c2.className));
-  const out = [HEADER, 'import type { EntityRef } from "@s2script/sdk/entity";'];
+  const out = [HEADER2, 'import type { EntityRef } from "@s2script/sdk/entity";'];
   const vecClasses = /* @__PURE__ */ new Set();
   for (const c2 of model.classes) for (const f of c2.ownFields) {
     const vi = VEC_INFO[f.accessorKind];
@@ -8913,7 +9213,7 @@ function emitDts(model) {
 }
 
 // src/schemagen/emit-js.ts
-var HEADER2 = "// GENERATED by `s2script gen-schema` from schema-catalog.json \u2014 DO NOT EDIT.";
+var HEADER3 = "// GENERATED by `s2script gen-schema` from schema-catalog.json \u2014 DO NOT EDIT.";
 var S = JSON.stringify;
 function resolveExpr(f) {
   const base = `off(${S(f.declaringClass)},${S(f.rawName)})`;
@@ -8940,7 +9240,7 @@ function accessorEntry(f, resolve22, guard2) {
   return entry;
 }
 function emitJs(model) {
-  const out = [HEADER2, "(function () {", "  var off = __s2_schema_offset;", "  var A = {};", "  var E = {};"];
+  const out = [HEADER3, "(function () {", "  var off = __s2_schema_offset;", "  var A = {};", "  var E = {};"];
   const vecClasses = /* @__PURE__ */ new Set();
   for (const c2 of model.classes) for (const f of c2.ownFields) {
     const vi = VEC_INFO[f.accessorKind];
@@ -9102,7 +9402,7 @@ function buildEventModel(catalog) {
 }
 
 // src/eventgen/emit-dts.ts
-var HEADER3 = "// GENERATED by `s2script gen-events` from event-catalog.json \u2014 DO NOT EDIT.";
+var HEADER4 = "// GENERATED by `s2script gen-events` from event-catalog.json \u2014 DO NOT EDIT.";
 var GETTER_RET = {
   getBool: "boolean",
   getFloat: "number",
@@ -9113,7 +9413,7 @@ var GETTER_RET = {
 };
 function emitEventDts(model) {
   const out = [
-    HEADER3,
+    HEADER4,
     'import type { GameEvent, HookResultValue } from "@s2script/sdk/events";',
     ""
   ];
@@ -9232,7 +9532,7 @@ function buildNavModel(config, catalog) {
 }
 
 // src/navgen/emit-js.ts
-var HEADER4 = "// GENERATED by `s2script gen-nav` from nav-targets.json \u2014 DO NOT EDIT.";
+var HEADER5 = "// GENERATED by `s2script gen-nav` from nav-targets.json \u2014 DO NOT EDIT.";
 var S2 = JSON.stringify;
 var READ_VIA = {
   f32: "readFloat32Via",
@@ -9250,7 +9550,7 @@ var WRITE_VIA = {
   i32: "writeInt32Via"
 };
 function emitNavJs(model) {
-  const out = [HEADER4, "(function () {", "  var off = __s2_schema_offset;"];
+  const out = [HEADER5, "(function () {", "  var off = __s2_schema_offset;"];
   const vecClasses = /* @__PURE__ */ new Set();
   for (const w of model.wrappers) {
     for (const f of w.fields) {
@@ -9332,7 +9632,7 @@ function emitNavJs(model) {
 }
 
 // src/navgen/emit-dts.ts
-var HEADER5 = "// GENERATED by `s2script gen-nav` from nav-targets.json \u2014 DO NOT EDIT.";
+var HEADER6 = "// GENERATED by `s2script gen-nav` from nav-targets.json \u2014 DO NOT EDIT.";
 function emitNavDts(model) {
   let needsEntityRef = false;
   let needsVector = false;
@@ -9345,7 +9645,7 @@ function emitNavDts(model) {
       if (vi?.cls === "QAngle") needsQAngle = true;
     }
   }
-  const out = [HEADER5];
+  const out = [HEADER6];
   const mathTypes = [];
   if (needsVector) mathTypes.push("Vector");
   if (needsQAngle) mathTypes.push("QAngle");
@@ -9416,72 +9716,6 @@ function runGenNav(repoRoot2, opts) {
 // src/hookgen/gen.ts
 import { readFileSync as readFileSync22, writeFileSync as writeFileSync17 } from "node:fs";
 import { join as join27 } from "node:path";
-
-// src/hookgen/model.ts
-function capitalize(name) {
-  return name.length === 0 ? name : name.charAt(0).toUpperCase() + name.slice(1);
-}
-function buildHookModel(hooks) {
-  const byNs = /* @__PURE__ */ new Map();
-  for (const name of Object.keys(hooks).sort()) {
-    const decl = hooks[name] ?? {};
-    const ns = decl.expose?.ctx;
-    if (!ns) continue;
-    const paramNames = decl.params ?? [];
-    const mutableSet = new Set(decl.mutable ?? []);
-    const params = paramNames.map((p) => ({ name: p, mutable: mutableSet.has(p) }));
-    const receiverAs = decl.receiver?.kind === "entity" ? decl.receiver.as ?? null : null;
-    const list = byNs.get(ns) ?? [];
-    list.push({ name, viewIface: `${capitalize(name)}View`, params, receiverAs });
-    byNs.set(ns, list);
-  }
-  return Array.from(byNs.keys()).sort().map((ns) => ({ ns, ctxIface: `Ctx${capitalize(ns)}`, hooks: byNs.get(ns) }));
-}
-
-// src/hookgen/emit-dts.ts
-var HEADER6 = "// GENERATED by `s2script gen-hooks` from gamedata/cs2/game.cs2.jsonc's `hooks` \u2014 DO NOT EDIT.";
-function emitViewIface(h2) {
-  const out = [`export interface ${h2.viewIface} {`];
-  for (const p of h2.params) {
-    const mod = p.mutable ? "" : "readonly ";
-    out.push(`  ${mod}${p.name}: number;`);
-  }
-  if (h2.receiverAs !== null) {
-    out.push(`  readonly ${h2.receiverAs}: EntityRef | null;`);
-  }
-  out.push("}", "");
-  return out;
-}
-function emitHookDts(model) {
-  const out = [
-    HEADER6,
-    'import type { HookResultValue } from "@s2script/sdk/events";',
-    'import type { EntityRef } from "@s2script/sdk/entity";',
-    ""
-  ];
-  for (const { hooks } of model) {
-    for (const h2 of hooks) {
-      out.push(...emitViewIface(h2));
-    }
-  }
-  for (const { ctxIface, hooks } of model) {
-    out.push(`export interface ${ctxIface} {`);
-    for (const h2 of hooks) {
-      out.push(`  ${h2.name}(handler: (view: ${h2.viewIface}) => HookResultValue | void): void;`);
-    }
-    out.push("}", "");
-  }
-  out.push('declare module "@s2script/sdk/plugin" {');
-  out.push("  interface PluginContext {");
-  for (const { ns, ctxIface } of model) {
-    out.push(`    readonly ${ns}: ${ctxIface};`);
-  }
-  out.push("  }");
-  out.push("}");
-  return out.join("\n") + "\n";
-}
-
-// src/hookgen/gen.ts
 var GAMEDATA_PATH = "gamedata/cs2/game.cs2.jsonc";
 var DTS_OUT4 = "packages/cs2/hooks.generated.d.ts";
 function runGenHooks(repoRoot2, opts) {