@forwardimpact/libwiki 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forwardimpact/libwiki",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Wiki lifecycle primitives — stable memory for agent teams so coordination persists across sessions.",
   "keywords": [
     "wiki",
@@ -46,6 +46,7 @@
   },
   "dependencies": {
     "@forwardimpact/libcli": "^0.1.0",
+    "@forwardimpact/libconfig": "^0.1.77",
     "@forwardimpact/libutil": "^0.1.0",
     "@forwardimpact/libxmr": "^1.1.0"
   },

package/src/commands/init.js

@@ -3,10 +3,14 @@ import { spawnSync } from "node:child_process";
 import path from "node:path";
 import fsAsync from "node:fs/promises";
 import { Finder } from "@forwardimpact/libutil";
+import { createScriptConfig } from "@forwardimpact/libconfig";
 import { WikiRepo } from "../wiki-repo.js";
 import { listSkills } from "../skill-roster.js";
 
-function deriveWikiUrl(parentDir) {
+/** Resolve the wiki clone URL. Honors the FIT_WIKI_URL env var as an explicit override (for sandboxed environments where `origin` is rewritten to a local proxy that does not serve wiki repos); otherwise derives the URL by appending `.wiki.git` to the parent repo's `origin` remote. */
+export function deriveWikiUrl(parentDir) {
+  if (process.env.FIT_WIKI_URL) return process.env.FIT_WIKI_URL;
+
   const r = spawnSync("git", ["-C", parentDir, "remote", "get-url", "origin"], {
     encoding: "utf-8",
     stdio: "pipe",
@@ -18,7 +22,7 @@ function deriveWikiUrl(parentDir) {
 }
 
 /** Clone the wiki if not already present (URL derived from origin remote), copy git identity from the parent repo, and create metric directories for each kata skill. */
-export function runInitCommand(values, _args, cli) {
+export async function runInitCommand(values, _args, cli) {
   const logger = { debug() {} };
   const finder = new Finder(fsAsync, logger, process);
   const projectRoot = finder.findProjectRoot(process.cwd());
@@ -37,7 +41,12 @@ export function runInitCommand(values, _args, cli) {
     return;
   }
 
-  const repo = new WikiRepo({ wikiDir, parentDir: projectRoot });
+  const config = await createScriptConfig("wiki");
+  const repo = new WikiRepo({
+    wikiDir,
+    parentDir: projectRoot,
+    resolveToken: () => config.ghToken(),
+  });
 
   const cloneResult = repo.ensureCloned(wikiUrl);
   if (!cloneResult.cloned) {

package/src/commands/sync.js

@@ -1,16 +1,26 @@
 import path from "node:path";
 import fsAsync from "node:fs/promises";
 import { Finder } from "@forwardimpact/libutil";
+import { createScriptConfig } from "@forwardimpact/libconfig";
 import { WikiRepo, WikiPullConflict } from "../wiki-repo.js";
 
-/** Commit all wiki changes and push them to the remote wiki repository. */
-export function runPushCommand(values, _args, cli) {
+async function buildRepo(values) {
   const logger = { debug() {} };
   const finder = new Finder(fsAsync, logger, process);
   const projectRoot = finder.findProjectRoot(process.cwd());
   const wikiDir = path.resolve(projectRoot, values["wiki-root"] ?? "wiki");
 
-  const repo = new WikiRepo({ wikiDir, parentDir: projectRoot });
+  const config = await createScriptConfig("wiki");
+  return new WikiRepo({
+    wikiDir,
+    parentDir: projectRoot,
+    resolveToken: () => config.ghToken(),
+  });
+}
+
+/** Commit all wiki changes and push them to the remote wiki repository. */
+export async function runPushCommand(values, _args, cli) {
+  const repo = await buildRepo(values);
   repo.inheritIdentity();
 
   const result = repo.commitAndPush("wiki: update from session");
@@ -22,13 +32,8 @@ export function runPushCommand(values, _args, cli) {
 }
 
 /** Fetch and rebase the local wiki on origin/master; on rebase conflict, exit the process with code 1 and a message to resolve manually or push first. */
-export function runPullCommand(values, _args, cli) {
-  const logger = { debug() {} };
-  const finder = new Finder(fsAsync, logger, process);
-  const projectRoot = finder.findProjectRoot(process.cwd());
-  const wikiDir = path.resolve(projectRoot, values["wiki-root"] ?? "wiki");
-
-  const repo = new WikiRepo({ wikiDir, parentDir: projectRoot });
+export async function runPullCommand(values, _args, cli) {
+  const repo = await buildRepo(values);
   repo.inheritIdentity();
 
   try {

package/src/wiki-repo.js

@@ -31,11 +31,31 @@ export function buildAuthArgs(args, token) {
 export class WikiRepo {
   #wikiDir;
   #parentDir;
+  #resolveToken;
 
-  /** Create a WikiRepo targeting the given wiki directory and its parent project directory. */
-  constructor({ wikiDir, parentDir }) {
+  /**
+   * Create a WikiRepo targeting the given wiki directory and its parent project directory.
+   * @param {{ wikiDir: string, parentDir: string, resolveToken: () => string | null }} opts
+   *   `resolveToken` is called lazily before each network operation. Return a
+   *   GitHub token string to authenticate, or `null` to run anonymously. The
+   *   callback owns the entire resolution policy — libwiki does not read
+   *   `process.env` directly. Throws propagate to the caller so credential
+   *   misconfiguration surfaces loudly. Commands typically pass
+   *   `() => config.ghToken()` from `@forwardimpact/libconfig`.
+   */
+  constructor({ wikiDir, parentDir, resolveToken }) {
+    if (typeof wikiDir !== "string" || wikiDir === "") {
+      throw new TypeError("WikiRepo: wikiDir must be a non-empty string");
+    }
+    if (typeof parentDir !== "string" || parentDir === "") {
+      throw new TypeError("WikiRepo: parentDir must be a non-empty string");
+    }
+    if (typeof resolveToken !== "function") {
+      throw new TypeError("WikiRepo: resolveToken callback is required");
+    }
     this.#wikiDir = wikiDir;
     this.#parentDir = parentDir;
+    this.#resolveToken = resolveToken;
   }
 
   /** Check whether the wiki directory is an initialized git repository. */
@@ -92,11 +112,16 @@ export class WikiRepo {
     }
   }
 
-  /** Stage all changes, commit with the given message, fetch, rebase on origin/master (falling back to a merge with -X ours if rebase fails), and push. */
+  /** Stage and commit any working-tree changes, then fetch, rebase on origin/master (falling back to a merge with -X ours if rebase fails), and push if HEAD is ahead of origin/master. The commit gate and the push gate are independent so a clean tree with local commits still pushes. */
   commitAndPush(message) {
-    if (this.isClean()) return { pushed: false, reason: "clean" };
-    this.#git(["add", "-A"]);
-    this.#git(["commit", "-m", message]);
+    const hasWorkingTreeChanges = !this.isClean();
+    if (hasWorkingTreeChanges) {
+      this.#git(["add", "-A"]);
+      this.#git(["commit", "-m", message]);
+    }
+    if (!this.#hasCommitsAhead()) {
+      return { pushed: false, reason: "clean" };
+    }
     this.fetch();
     const rebase = this.#git(["rebase", "origin/master"]);
     if (rebase.status !== 0) {
@@ -107,6 +132,12 @@ export class WikiRepo {
     return { pushed: true, reason: "pushed" };
   }
 
+  #hasCommitsAhead() {
+    const r = this.#git(["rev-list", "--count", "origin/master..HEAD"]);
+    const count = parseInt(r.stdout?.toString().trim() || "0", 10);
+    return count > 0;
+  }
+
   #parentConfig(key) {
     const r = spawnSync(
       "git",
@@ -123,11 +154,14 @@ export class WikiRepo {
   }
 
   #authGit(args) {
-    const token = process.env.GH_TOKEN || process.env.GITHUB_TOKEN;
+    const token = this.#resolveToken();
     const fullArgs = buildAuthArgs(args, token);
-    return spawnSync("git", fullArgs, {
-      stdio: "pipe",
-      env: token ? process.env : undefined,
-    });
+    // The credential helper body keeps `${GH_TOKEN:-$GITHUB_TOKEN}` literal so
+    // git's child shell expands it at auth time — the token never sits in argv.
+    // Inject the resolved token into the spawn env so the helper's lazy
+    // expansion finds it even when the resolver pulled from `.env` or
+    // `gh auth token` rather than the ambient process env.
+    const env = token ? { ...process.env, GH_TOKEN: token } : undefined;
+    return spawnSync("git", fullArgs, { stdio: "pipe", env });
   }
 }