@tiens.nguyen/gu-cli 1.0.784 → 1.0.785

package/skill-source.mjs

@@ -0,0 +1,60 @@
+/**
+ * WHOSE SKILLS THIS FOLDER USES — gu's or Claude Code's (task #325, /switch-skill).
+ *
+ *   "gu"      ~/.gonext  and  <project>/.gonext     (the default; a folder that never chose)
+ *   "claude"  ~/.claude  and  <project>/.claude     Claude Code's own files, read where they are
+ *
+ * One choice covers skills, MCP servers and hooks, because they depend on each other: a skill names
+ * an MCP server's tools, and the hooks feed the same database that server reads. Switching one of
+ * the three alone would leave them talking about different things.
+ *
+ * ONE-WAY. gu reads Claude Code's setup; Claude Code is never expected to read gu's. So nothing of
+ * gu's own is written into Claude's files: which project servers and hooks you approved, and the
+ * allow rules, stay in ~/.gonext whichever source is chosen.
+ *
+ * PER FOLDER, IN THE FOLDER'S SESSION FILE. The terminal writes it; the worker — a different
+ * process, which builds each turn's skills, servers and hooks — reads the same file. Every reader
+ * in this package resolves the source through readSkillSource, so the banner and the turn cannot
+ * disagree about which setup is in use.
+ */
+import { createHash } from "node:crypto";
+import { readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+export const SKILL_SOURCES = ["gu", "claude"];
+export const DEFAULT_SKILL_SOURCE = "gu";
+/** The session file's key. */
+export const SKILL_SOURCE_KEY = "skillSource";
+
+export const normalizeSkillSource = (v) => (v === "claude" ? "claude" : DEFAULT_SKILL_SOURCE);
+
+/** The folder each source keeps its files in — under the home directory and under the project. */
+export const sourceDirName = (source) => (normalizeSkillSource(source) === "claude" ? ".claude" : ".gonext");
+
+/** What a picker and a status line call it. */
+export const sourceLabel = (source) => (normalizeSkillSource(source) === "claude" ? "Claude's skills" : "gu's skills");
+
+/** The terminal's per-folder session file — the same name gu-repl.mjs uses. */
+export function sessionFileFor(cwd, home = homedir()) {
+  const hash = createHash("sha256").update(String(cwd)).digest("hex").slice(0, 32);
+  return join(home, ".gonext", "sessions", `${hash}.json`);
+}
+
+/**
+ * This folder's choice. No folder, no session file, a file that cannot be read, any other value:
+ * gu's — the behaviour before there was a choice, and never an error.
+ */
+export function readSkillSource(cwd, home = homedir()) {
+  if (!cwd) return DEFAULT_SKILL_SOURCE;
+  try {
+    const raw = JSON.parse(readFileSync(sessionFileFor(cwd, home), "utf8"));
+    return normalizeSkillSource(raw?.[SKILL_SOURCE_KEY]);
+  } catch {
+    return DEFAULT_SKILL_SOURCE;
+  }
+}
+
+/** `source` when a caller names one, else the folder's own. */
+export const resolveSkillSource = ({ source, cwd, home = homedir() } = {}) =>
+  source ? normalizeSkillSource(source) : readSkillSource(cwd, home);

package/skills.mjs

@@ -4,6 +4,10 @@
  *   ~/.gonext/skills/<name>/SKILL.md        yours, every folder
  *   <project>/.gonext/skills/<name>/SKILL.md this project only
  *
+ * …or Claude Code's own, when the folder chose them with /switch-skill (#325, skill-source.mjs):
+ *   ~/.claude/skills/<name>/SKILL.md  and  <project>/.claude/skills/<name>/SKILL.md
+ * The same file in the same layout — only the folder differs, so nothing is converted.
+ *
  * A SKILL.md is YAML frontmatter (name, description) and a body of instructions. Only the name and
  * description go into every prompt; the body is read when the agent calls use_skill(name) or the
  * user types /<name> — never pasted into every turn. Same split as Claude Code, and for the same
@@ -24,16 +28,17 @@
 import { readdirSync, readFileSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { resolveSkillSource, sourceDirName } from "./skill-source.mjs";
 
 export const SKILL_FILE = "SKILL.md";
 /** Claude Code's rule: lowercase letters, digits and hyphens, at most 64. It is also a slash command. */
 export const SKILL_NAME_RE = /^[a-z0-9][a-z0-9-]{0,63}$/;
 
-export function userSkillsDir(home = homedir()) {
-  return join(home, ".gonext", "skills");
+export function userSkillsDir(home = homedir(), source = "gu") {
+  return join(home, sourceDirName(source), "skills");
 }
-export function projectSkillsDir(cwd) {
-  return join(cwd, ".gonext", "skills");
+export function projectSkillsDir(cwd, source = "gu") {
+  return join(cwd, sourceDirName(source), "skills");
 }
 
 /** Strip one pair of matching quotes. */
@@ -138,13 +143,17 @@ function scanDir(dir, scope) {
  * the built-in wins, and the skill is still usable by the agent, just not as a slash command —
  * that is `slash: false`.
  *
- * → { skills: [{ name, description, path, dir, scope, slash }], warnings: string[] }
+ * `source` = whose skills ("gu" | "claude"); left out, it is the folder's own choice (/switch-skill).
+ * Only that source's skills are listed — the two are never mixed.
+ *
+ * → { skills: [{ name, description, path, dir, scope, slash, source }], warnings: string[], source }
  */
-export function discoverSkills({ cwd = process.cwd(), home = homedir(), reserved = [] } = {}) {
-  const user = scanDir(userSkillsDir(home), "user");
+export function discoverSkills({ cwd = process.cwd(), home = homedir(), reserved = [], source } = {}) {
+  const src = resolveSkillSource({ source, cwd, home });
+  const user = scanDir(userSkillsDir(home, src), "user");
   const project =
-    cwd && projectSkillsDir(cwd) !== userSkillsDir(home)
-      ? scanDir(projectSkillsDir(cwd), "project")
+    cwd && projectSkillsDir(cwd, src) !== userSkillsDir(home, src)
+      ? scanDir(projectSkillsDir(cwd, src), "project")
       : { skills: [], warnings: [] };
   const byName = new Map();
   for (const s of user.skills) byName.set(s.name, s);
@@ -152,17 +161,20 @@ export function discoverSkills({ cwd = process.cwd(), home = homedir(), reserved
   const taken = new Set(reserved.map((r) => r.replace(/^\//, "")));
   const skills = [...byName.values()]
     .sort((a, b) => a.name.localeCompare(b.name))
-    .map((s) => ({ ...s, slash: !taken.has(s.name) }));
-  return { skills, warnings: [...user.warnings, ...project.warnings] };
+    .map((s) => ({ ...s, slash: !taken.has(s.name), source: src }));
+  return { skills, warnings: [...user.warnings, ...project.warnings], source: src };
 }
 
 /** What the worker hands the agent for one turn: enough to list them and to read one. */
 export function skillsForTurn(opts) {
-  return discoverSkills(opts).skills.map(({ name, description, path, dir }) => ({
+  // `source` goes along only for Claude's: the agent then reads the skill as one written for
+  // Claude Code's tools (gu_skills.py). gu's own keep the shape they always had.
+  return discoverSkills(opts).skills.map(({ name, description, path, dir, source }) => ({
     name,
     description,
     path,
     dir,
+    ...(source === "claude" ? { source } : {}),
   }));
 }