geneseed 3.20.0 → 4.0.0

package/js/hosts/opencode.mjs

@@ -28,7 +28,10 @@ import { jsonDumps, jsonDumpsIndent, parseJson } from '../lib/json.mjs';
 import { comparePaths } from '../lib/paths.mjs';
 import { sourceReleaseVersion } from '../build/version.mjs';
 import { aliasesOf } from '../build/source.mjs';
-import { firstBlockquote, stripSkillBodyLinks, pointSideFiles, pushOverrideLines } from './native.mjs';
+import {
+  firstBlockquote, isUserInvokedOnly, skillDescription, stripSkillBodyLinks, pointSideFiles,
+  pushOverrideLines,
+} from './native.mjs';
 
 // Re-exported for `js/web/api.mjs` and the tests, which import it from here.
 export { sourceReleaseVersion };
@@ -169,10 +172,19 @@ export function themeJson(theme) {
   return { $schema: 'https://opencode.ai/theme.json', theme: t };
 }
 
-/** `_build_emit._write_theme` — `<themes_dir>/geneseed-<theme>.json`. */
-export function writeTheme(themesDir, themeName, theme) {
-  mkdirSync(themesDir, { recursive: true });
+/**
+ * `_build_emit._write_theme` — `<themes_dir>/geneseed-<theme>.json`.
+ *
+ * `claim` — the same `claimer` closure the native layer and command writers share (see
+ * `writePrimaryAgent`'s docblock). Without it a user's own same-named theme file was
+ * overwritten and recorded in `owned`, so uninstall deleted it next. Default: claim
+ * everything, for a caller with no manifest to consult. Returns `null`, not the dest,
+ * when the claim is refused — so the caller does not push a non-write into `owned`.
+ */
+export function writeTheme(themesDir, themeName, theme, claim = (_dest) => true) {
   const dest = path.join(themesDir, `geneseed-${themeName}.json`);
+  if (!claim(dest)) return null;
+  mkdirSync(themesDir, { recursive: true });
   writeText(dest, `${jsonDumpsIndent(themeJson(theme))}\n`);
   return dest;
 }
@@ -215,8 +227,8 @@ export function colorThemeFiles(cfg) {
     .sort(comparePaths);
 }
 
-/** `_build_emit._write_color_themes` — each curated palette in both flavours. */
-export function writeColorThemes(cfg, themesDir) {
+/** `_build_emit._write_color_themes` — each curated palette in both flavours. `claim` — see `writeTheme`. */
+export function writeColorThemes(cfg, themesDir, claim = (_dest) => true) {
   mkdirSync(themesDir, { recursive: true });
   const written = [];
   for (const src of colorThemeFiles(cfg)) {
@@ -224,6 +236,7 @@ export function writeColorThemes(cfg, themesDir) {
     const palette = spec.palette;
     for (const [flavour, transparent] of [['solid', false], ['transparent', true]]) {
       const dest = path.join(themesDir, `geneseed-${spec.name}-${flavour}.json`);
+      if (!claim(dest)) continue;
       writeText(dest, `${jsonDumpsIndent(colorThemeJson(palette, transparent))}\n`);
       written.push(dest);
     }
@@ -336,9 +349,17 @@ export function writeCommandLayer(cfg, items, commandDir, claim = (_dest) => tru
  * second copy of its target. UNCONDITIONAL, unlike the `GENESEED_COMMANDS` set — an old name
  * that only works behind an opt-in is a name that broke. Read off the already-filtered
  * `items`, so excluding the target drops its aliases.
+ *
+ * `alsoUserOnly` (Bob host-compat O2/R1): Bob's skills page documents no model-invocation
+ * key either, so a genuinely user-only skill (not just an alias) needs the same treatment —
+ * `writeNativeLayer({ bobDialect: true })` already skipped its SKILL.md, and this is the one
+ * place left to give `/<stem>` a home. Default `false`: OpenCode's own call site leaves this
+ * off, because a real user-only skill there is handled by `permission.skill` deny instead
+ * (Task 4) — it keeps its SKILL.md and does not need a second, command-shaped copy.
  */
 export function writeAliasCommands(cfg, items, commandDir, claim = (_dest) => true,
-  skillDirOf = (n) => path.join(path.dirname(commandDir), 'skills', n).split(path.sep).join('/')) {
+  skillDirOf = (n) => path.join(path.dirname(commandDir), 'skills', n).split(path.sep).join('/'),
+  alsoUserOnly = false) {
   const written = [];
   for (const { text, src } of items) {
     if (text === null) continue;
@@ -346,11 +367,13 @@ export function writeAliasCommands(cfg, items, commandDir, claim = (_dest) => tr
     if (sp.length !== 2 || sp[0] !== 'skills' || !sp[1].endsWith('.md') || sp[1].startsWith('_')) continue;
     const stem = sp[1].slice(0, -3);
     const body = stripSkillBodyLinks(pointSideFiles(text.replace(/^\n+/, ''), stem, skillDirOf(stem)));
-    for (const alias of aliasesOf(text)) {
-      const dest = path.join(commandDir, `${alias}.md`);
+    const names = alsoUserOnly && isUserInvokedOnly(text) ? [...aliasesOf(text), stem] : aliasesOf(text);
+    for (const name of names) {
+      const dest = path.join(commandDir, `${name}.md`);
       if (!claim(dest)) continue;
       mkdirSync(path.dirname(dest), { recursive: true });
-      writeText(dest, `---\ndescription: ${jsonDumps(`Alias of ${sp[1].slice(0, -3)}.`)}\n---\n\n${body}`);
+      const desc = name === stem ? skillDescription(text) : `Alias of ${stem}.`;
+      writeText(dest, `---\ndescription: ${jsonDumps(desc)}\n---\n\n${body}`);
       written.push(dest);
     }
   }
@@ -367,8 +390,13 @@ export function writePonytailCommand(commandDir, claim = (_dest) => true) {
   return dest;
 }
 
-/** `_copy_plugins` / `_copy_workflows` — maintained files, copied verbatim (copy2, so LF). */
-function copyJsDir(srcDir, dst, owned, prefix) {
+/**
+ * `_copy_plugins` / `_copy_workflows` — maintained files, copied verbatim (copy2, so LF).
+ *
+ * `claim` — see `writeTheme`. A file the claim refuses is skipped: not copied, not counted,
+ * not pushed into `owned`, exactly as a declined native-layer write is.
+ */
+function copyJsDir(srcDir, dst, owned, prefix, claim = (_dest) => true) {
   let n = 0;
   if (existsSync(srcDir) && statSync(srcDir).isDirectory()) {
     mkdirSync(dst, { recursive: true });
@@ -377,7 +405,9 @@ function copyJsDir(srcDir, dst, owned, prefix) {
       .map((name) => path.join(srcDir, name))
       .sort(comparePaths);
     for (const js of files) {
-      copyFile(js, path.join(dst, path.basename(js)));
+      const dest = path.join(dst, path.basename(js));
+      if (!claim(dest)) continue;
+      copyFile(js, dest);
       if (owned !== null && owned !== undefined) owned.push(`${prefix}/${path.basename(js)}`);
       n += 1;
     }
@@ -386,11 +416,11 @@ function copyJsDir(srcDir, dst, owned, prefix) {
 }
 
 /** `_build_emit._copy_plugins`. */
-export function copyPlugins(cfg, dst, owned = null) {
-  return copyJsDir(cfg.pluginSrc, dst, owned, 'plugins');
+export function copyPlugins(cfg, dst, owned = null, claim = (_dest) => true) {
+  return copyJsDir(cfg.pluginSrc, dst, owned, 'plugins', claim);
 }
 
 /** `_build_emit._copy_workflows`. */
-export function copyWorkflows(cfg, dst, owned = null) {
-  return copyJsDir(cfg.workflowSrc, dst, owned, 'workflows');
+export function copyWorkflows(cfg, dst, owned = null, claim = (_dest) => true) {
+  return copyJsDir(cfg.workflowSrc, dst, owned, 'workflows', claim);
 }