wholestack 0.5.3 → 0.5.5

package/dist/cli.js

@@ -19,84 +19,26 @@ import {
   loadMcpTools,
   loadPlugins,
   loadProjectMemory,
+  loadStoredEnv,
   mergeHookSets,
   modelContextWindow,
   modelLabel,
   resolveModel,
   resolveModelKey,
   runProver,
+  saveKey,
+  stateDir,
   statusLine,
   supportsThinking,
   tasks,
   userBox,
   visionCapable
-} from "./chunk-FI67ER5S.js";
+} from "./chunk-7NZ77Q7Q.js";
 
 // src/cli.ts
 import { createInterface } from "readline/promises";
 import { stdin, stdout, argv, exit, cwd } from "process";
 
-// src/config.ts
-import { readFileSync, writeFileSync, mkdirSync, existsSync, chmodSync } from "fs";
-import { homedir } from "os";
-import { join } from "path";
-var CONFIG_DIR = join(homedir(), ".zeta-g");
-var CONFIG_PATH = join(CONFIG_DIR, "config.json");
-function parseDotenv(text) {
-  const out = {};
-  for (const raw of text.split("\n")) {
-    const l = raw.trim();
-    if (!l || l.startsWith("#")) continue;
-    const eq = l.indexOf("=");
-    if (eq < 0) continue;
-    const k = l.slice(0, eq).trim();
-    let v = l.slice(eq + 1).trim();
-    if (v.startsWith('"') && v.endsWith('"') || v.startsWith("'") && v.endsWith("'")) {
-      v = v.slice(1, -1);
-    }
-    if (k) out[k] = v;
-  }
-  return out;
-}
-function fill(src) {
-  for (const [k, v] of Object.entries(src)) {
-    if (v && process.env[k] === void 0) process.env[k] = v;
-  }
-}
-function loadStoredEnv() {
-  const localEnv = join(process.cwd(), ".env");
-  if (existsSync(localEnv)) {
-    try {
-      fill(parseDotenv(readFileSync(localEnv, "utf8")));
-    } catch {
-    }
-  }
-  if (existsSync(CONFIG_PATH)) {
-    try {
-      const json = JSON.parse(readFileSync(CONFIG_PATH, "utf8"));
-      const flat = {};
-      for (const [k, v] of Object.entries(json)) if (typeof v === "string") flat[k] = v;
-      fill(flat);
-    } catch {
-    }
-  }
-}
-function saveKey(name, value) {
-  mkdirSync(CONFIG_DIR, { recursive: true });
-  let current = {};
-  if (existsSync(CONFIG_PATH)) {
-    try {
-      current = JSON.parse(readFileSync(CONFIG_PATH, "utf8"));
-    } catch {
-      current = {};
-    }
-  }
-  current[name] = value;
-  writeFileSync(CONFIG_PATH, JSON.stringify(current, null, 2) + "\n", { mode: 384 });
-  chmodSync(CONFIG_PATH, 384);
-  return CONFIG_PATH;
-}
-
 // src/cli-login.ts
 import { createServer } from "http";
 import { spawn } from "child_process";
@@ -284,7 +226,7 @@ var CheckpointStore = class {
 
 // src/mentions.ts
 import { readFile as readFile2, stat, readdir } from "fs/promises";
-import { resolve, relative, join as join2, isAbsolute } from "path";
+import { resolve, relative, join, isAbsolute } from "path";
 import fg from "fast-glob";
 var IGNORE = [
   "**/node_modules/**",
@@ -341,7 +283,7 @@ async function renderTree(absDir, relDir) {
       }
       count++;
       lines.push(`${prefix}${e.name}${e.isDirectory() ? "/" : ""}`);
-      if (e.isDirectory()) await walk(join2(dir, e.name), prefix + "  ", depth + 1);
+      if (e.isDirectory()) await walk(join(dir, e.name), prefix + "  ", depth + 1);
     }
   }
   await walk(absDir, "", 0);
@@ -357,7 +299,7 @@ async function expandMentions(message, cwd2, tokenBudget = DEFAULT_TOKEN_BUDGET)
   let spent = 0;
   for (const mention of mentions) {
     if (spent >= tokenBudget) break;
-    const raw = mention.startsWith("~/") ? join2(process.env.HOME ?? "", mention.slice(2)) : mention;
+    const raw = mention.startsWith("~/") ? join(process.env.HOME ?? "", mention.slice(2)) : mention;
     const direct = isAbsolute(raw) ? raw : resolve(cwd2, raw);
     let isDir = false;
     try {
@@ -484,7 +426,7 @@ function buildSubagentTool(deps) {
 
 // src/images.ts
 import { readFile as readFile3, stat as stat2 } from "fs/promises";
-import { resolve as resolve2, extname, relative as relative2, isAbsolute as isAbsolute2, join as join3 } from "path";
+import { resolve as resolve2, extname, relative as relative2, isAbsolute as isAbsolute2, join as join2 } from "path";
 import { execFile } from "child_process";
 import { tmpdir, platform as platform2 } from "os";
 var EXT_TO_MEDIA = {
@@ -505,7 +447,7 @@ function run(cmd, args) {
   });
 }
 async function grabClipboardImage() {
-  const out = join3(tmpdir(), `zeta-clip-${process.pid}-${process.hrtime.bigint()}.png`);
+  const out = join2(tmpdir(), `zeta-clip-${process.pid}-${process.hrtime.bigint()}.png`);
   const os = platform2();
   if (os === "darwin") {
     const script = `set thePath to "${out}"
@@ -568,7 +510,7 @@ async function scanImages(message, cwd2) {
     }
   }
   for (const tok of tokens) {
-    const raw = tok.startsWith("~/") ? join3(process.env.HOME ?? "", tok.slice(2)) : tok;
+    const raw = tok.startsWith("~/") ? join2(process.env.HOME ?? "", tok.slice(2)) : tok;
     const abs = isAbsolute2(raw) ? raw : resolve2(cwd2, raw);
     const mediaType = EXT_TO_MEDIA[extname(abs).toLowerCase()];
     if (!mediaType) continue;
@@ -624,7 +566,7 @@ async function fetchReadable(url) {
     const res = await fetch(url, {
       signal: ctrl.signal,
       redirect: "follow",
-      headers: { "user-agent": "zeta-g-cli/0.4 (+web-context)" }
+      headers: { "user-agent": "wholestack-cli (+web-context)" }
     });
     if (!res.ok) return null;
     const ctype = res.headers.get("content-type") ?? "";
@@ -675,7 +617,7 @@ ${body}`);
 }
 
 // src/export.ts
-import { writeFileSync as writeFileSync2 } from "fs";
+import { writeFileSync } from "fs";
 import { resolve as resolve3 } from "path";
 function renderContent(content) {
   if (typeof content === "string") return content.trim();
@@ -692,7 +634,7 @@ function renderContent(content) {
 }
 function renderTranscript(messages, meta) {
   const head = [
-    `# zeta-g transcript`,
+    `# wholestack transcript`,
     ``,
     `- model: ${meta.model}`,
     meta.startedAt ? `- started: ${meta.startedAt}` : "",
@@ -716,33 +658,31 @@ ${body}
 }
 function writeTranscript(messages, meta, file, cwd2) {
   const abs = resolve3(cwd2, file);
-  writeFileSync2(abs, renderTranscript(messages, meta), "utf8");
+  writeFileSync(abs, renderTranscript(messages, meta), "utf8");
   return abs;
 }
 
 // src/cli.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync4, writeFileSync as writeFileSync5 } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join6 } from "path";
+import { existsSync as existsSync2, mkdirSync as mkdirSync3, writeFileSync as writeFileSync4 } from "fs";
+import { join as join5 } from "path";
 
 // src/update-check.ts
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync3 } from "fs";
-import { homedir as homedir2 } from "os";
-import { join as join4 } from "path";
+import { existsSync, mkdirSync, readFileSync, writeFileSync as writeFileSync2 } from "fs";
+import { join as join3 } from "path";
 var PKG = "wholestack";
-var CACHE = join4(homedir2(), ".zeta-g", "update-check.json");
+var CACHE = join3(stateDir(), "update-check.json");
 var DAY_MS = 24 * 60 * 60 * 1e3;
 function readCache() {
   try {
-    return JSON.parse(readFileSync2(CACHE, "utf8"));
+    return JSON.parse(readFileSync(CACHE, "utf8"));
   } catch {
     return { lastCheck: 0, latest: null };
   }
 }
 function writeCache(c2) {
   try {
-    mkdirSync2(join4(homedir2(), ".zeta-g"), { recursive: true });
-    writeFileSync3(CACHE, JSON.stringify(c2));
+    mkdirSync(stateDir(), { recursive: true });
+    writeFileSync2(CACHE, JSON.stringify(c2));
   } catch {
   }
 }
@@ -757,7 +697,7 @@ function isNewer(a, b) {
   return false;
 }
 async function checkForUpdate(current) {
-  if (process.env.ZETA_NO_UPDATE_CHECK || !existsSync2) return null;
+  if (process.env.ZETA_NO_UPDATE_CHECK || !existsSync) return null;
   const cache = readCache();
   const fresh = Date.now() - cache.lastCheck < DAY_MS;
   let latest = cache.latest;
@@ -783,22 +723,21 @@ async function checkForUpdate(current) {
 }
 
 // src/access.ts
-import { mkdirSync as mkdirSync3, readFileSync as readFileSync3, rmSync, writeFileSync as writeFileSync4 } from "fs";
-import { homedir as homedir3 } from "os";
-import { join as join5 } from "path";
-var CACHE2 = join5(homedir3(), ".zeta-g", "access.json");
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync2, rmSync, writeFileSync as writeFileSync3 } from "fs";
+import { join as join4 } from "path";
+var CACHE2 = join4(stateDir(), "access.json");
 var TTL_MS = 60 * 60 * 1e3;
 function readCache2() {
   try {
-    return JSON.parse(readFileSync3(CACHE2, "utf8"));
+    return JSON.parse(readFileSync2(CACHE2, "utf8"));
   } catch {
     return null;
   }
 }
 function writeCache2(c2) {
   try {
-    mkdirSync3(join5(homedir3(), ".zeta-g"), { recursive: true });
-    writeFileSync4(CACHE2, JSON.stringify(c2));
+    mkdirSync2(stateDir(), { recursive: true });
+    writeFileSync3(CACHE2, JSON.stringify(c2));
   } catch {
   }
 }
@@ -858,12 +797,20 @@ function showPaywall(loggedIn, webUrl) {
 }
 
 // src/cli.ts
-import { readFileSync as readFileSync4 } from "fs";
-import { basename } from "path";
-var VERSION = "0.5.0";
+import { readFileSync as readFileSync3 } from "fs";
+import { basename, dirname as dirname2 } from "path";
+import { fileURLToPath } from "url";
+var VERSION = (() => {
+  try {
+    const here = dirname2(fileURLToPath(import.meta.url));
+    return JSON.parse(readFileSync3(join5(here, "..", "package.json"), "utf8")).version;
+  } catch {
+    return "0.0.0";
+  }
+})();
 function gitBranch(dir) {
   try {
-    const head = readFileSync4(join6(dir, ".git", "HEAD"), "utf8").trim();
+    const head = readFileSync3(join5(dir, ".git", "HEAD"), "utf8").trim();
     const m = head.match(/ref:\s*refs\/heads\/(.+)$/);
     return m ? m[1] : head.slice(0, 7);
   } catch {
@@ -917,19 +864,19 @@ function parse(raw) {
   a.prompt = rest.join(" ").trim();
   return a;
 }
-var HELP = `${c.cyan("zeta-g")} \u2014 conversational coding agent for the ZETA engine
+var HELP = `${c.cyan("wholestack")} \u2014 conversational coding agent for the Wholestack engine ${c.dim("(alias: zeta)")}
 
 ${c.bold("Usage")}
-  zeta-g                       start an interactive session
-  zeta-g "build me a todo app" run one prompt and exit
-  zeta-g -m zeta-g1-max "..."  drive it with the most capable brain
+  wholestack                       start an interactive session
+  wholestack "build me a todo app" run one prompt and exit
+  wholestack -m zeta-g1-max "..."  drive it with the most capable brain
 
 ${c.bold("Web3 security")} ${c.dim("(forge \xB7 slither \xB7 firewall \xB7 halmos \xB7 signed cert)")}
-  zeta-g audit  <dir> <Contract>                 full auto-detect security sweep
-  zeta-g prove  <dir> <Contract> --property <k>  prove one invariant
-  zeta-g verify <dir> <Contract> --cert c.json   passthrough + signed certificate
+  wholestack audit  <dir> <Contract>                 full auto-detect security sweep
+  wholestack prove  <dir> <Contract> --property <k>  prove one invariant
+  wholestack verify <dir> <Contract> --cert c.json   passthrough + signed certificate
   ${c.dim("kinds: reentrancy-safety, access-control, conservation, no-value-extraction, \u2026")}
-  zeta-g --nzt48 "audit ./contracts"            NZT-48 web3 special-ops persona
+  wholestack --nzt48 "audit ./contracts"            NZT-48 web3 special-ops persona
 
 ${c.bold("Session")}
   -m, --model <key>   zeta-g1-lite | zeta-g1 | zeta-g1-max | vision
@@ -949,15 +896,15 @@ ${c.bold("Extensibility")}
       --no-mcp        skip MCP servers      --no-plugins   skip plugins
 
 ${c.bold("Build engine")}
-      --zeta-url <u>  ZETA engine base URL (default http://localhost:3000)
+      --zeta-url <u>  build engine base URL (default https://wholestack.ai)
       --local         build via the in-repo worker (no server needed)
-      --http          build via the running ZETA engine only
+      --http          build via the running engine only
 
-${c.bold("Auth")} ${c.dim("(set once, then just run zeta-g)")}
-  zeta-g login                     interactive \u2014 pick member/brain/engine, paste key
-  zeta-g login --member <key>      membership key (keep + deploy generated apps)
-  zeta-g login --brain <key>       brain key (powers the Zeta-G1.0 tiers)
-  zeta-g login --build <key>       ZETA build-engine key (for /build)
+${c.bold("Auth")} ${c.dim("(set once, then just run wholestack)")}
+  wholestack login                     browser sign-in (or pick member/brain/engine, paste key)
+  wholestack login --member <key>      membership key (keep + deploy generated apps)
+  wholestack login --brain <key>       brain key (powers the Zeta-G1.0 tiers)
+  wholestack login --build <key>       build-engine key (for /build)
 
 ${c.bold("In a session")} ${c.dim("(type /help for the full list)")}
   /model /cost /tools /undo /redo /checkpoints /compact /resume /memory /mcp /mode /think /init /doctor /clear /exit
@@ -992,14 +939,14 @@ async function runSecuritySubcommand(raw) {
 }
 function maybeYoloNotice() {
   try {
-    const dir = join6(homedir4(), ".zeta-g");
-    const marker = join6(dir, "yolo-notice-seen");
-    if (existsSync3(marker)) return;
+    const dir = stateDir();
+    const marker = join5(dir, "yolo-notice-seen");
+    if (existsSync2(marker)) return;
     line(
       "  " + c.yellow("\u26A1 yolo mode") + c.dim(" \u2014 actions run without confirmation. ") + c.cyan("/mode default") + c.dim(" to require approvals \xB7 /undo reverts.") + "\n"
     );
-    mkdirSync4(dir, { recursive: true });
-    writeFileSync5(marker, (/* @__PURE__ */ new Date()).toISOString());
+    mkdirSync3(dir, { recursive: true });
+    writeFileSync4(marker, (/* @__PURE__ */ new Date()).toISOString());
   } catch {
   }
 }
@@ -1054,7 +1001,7 @@ async function runLogin(raw) {
   }
   if (!name || !value) {
     if (!stdin.isTTY) {
-      line(c.red("  usage: zeta-g login --member <key> | --brain <key> | --build <key>"));
+      line(c.red("  usage: wholestack login --member <key> | --brain <key> | --build <key>"));
       return 1;
     }
     const rl = createInterface({ input: stdin, output: stdout });
@@ -1073,7 +1020,7 @@ async function runLogin(raw) {
   const path = saveKey(name, value);
   if (name === "ZETA_API_KEY") clearAccessCache();
   line(c.green(`  \u2713 saved key for the ${what}`) + c.dim(`  \u2192 ${path} (chmod 600)`));
-  line(c.dim("  now just run `zeta-g`."));
+  line(c.dim("  now just run `wholestack`."));
   return 0;
 }
 var EMPTY_PLUGINS = {
@@ -1295,7 +1242,7 @@ ${m.context}` : args.prompt;
     await ic.runInterruptible((sig) => agent.send(text, sig, images));
     statusLine({
       model: modelLabel(modelKey),
-      tokens: agent.usage.totalTokens,
+      tokens: agent.usage.outputTokens,
       tps: agent.lastTps,
       elapsedMs: Date.now() - t0,
       cost: agent.usage.totalCost,

package/dist/index.d.ts

@@ -70,7 +70,7 @@ declare class Permissions {
     private readonly confirm?;
     /**
      * Persist a chosen mode so it survives across sessions. Wired by the CLI to
-     * write `~/.zeta-g/config.json`. Optional — when absent, choices are
+     * write `~/.wholestack/config.json`. Optional — when absent, choices are
      * session-only (e.g. piped / non-TTY runs).
      */
     private readonly persistMode?;
@@ -79,7 +79,7 @@ declare class Permissions {
     constructor(mode: PermissionMode, confirm?: ConfirmFn | undefined, 
     /**
      * Persist a chosen mode so it survives across sessions. Wired by the CLI to
-     * write `~/.zeta-g/config.json`. Optional — when absent, choices are
+     * write `~/.wholestack/config.json`. Optional — when absent, choices are
      * session-only (e.g. piped / non-TTY runs).
      */
     persistMode?: ((mode: PermissionMode) => void) | undefined);
@@ -194,6 +194,7 @@ declare function buildTools(ctx: ToolContext): {
         scope: "full" | "static" | "component" | "page";
         buildModel: "zeta-g1" | "zeta-g1-max";
         keep: boolean;
+        themeId?: "slate-minimal" | "clean-inter" | "friendly-nunito" | "geometric-jakarta" | "techno-mono" | undefined;
     }, BuildResult | {
         ok: boolean;
         liveUrl: string | undefined;
@@ -566,7 +567,7 @@ declare class HookRunner {
 }
 /** Merge hook sets (later wins on nothing — they all concatenate). */
 declare function mergeHookSets(...sets: HookSet[]): HookSet;
-/** Load hooks.json from the global config dir and the project's .zeta-g/. */
+/** Load hooks.json from the global config dir and the project's .wholestack/ (or legacy .zeta-g/). */
 declare function loadHookFiles(cwd: string): HookSet;
 /**
  * Wrap every tool's execute so PreToolUse hooks can block it and PostToolUse
@@ -635,6 +636,8 @@ declare class UsageMeter {
     private cost;
     add(modelId: string, u: TokenUsage): void;
     get totalTokens(): number;
+    /** Output tokens only — the "what did it actually generate" number. */
+    get outputTokens(): number;
     get totalCost(): number;
     snapshot(): {
         input: number;
@@ -905,7 +908,7 @@ declare function loadMcpTools(opts: LoadMcpOptions): Promise<LoadedMcp>;
 
 /**
  * Slash commands — the in-session control surface. An extensible registry, not
- * a hardcoded if/else: built-ins live here, plugins and ~/.zeta-g/commands/*.md
+ * a hardcoded if/else: built-ins live here, plugins and ~/.wholestack/commands/*.md
  * register more. A command returns a CommandResult the REPL acts on, so the
  * registry stays decoupled from the agent it drives.
  */
@@ -971,7 +974,7 @@ declare class CommandRegistry {
     get(name: string): SlashCommand | undefined;
     list(): SlashCommand[];
     names(): string[];
-    /** Load *.md commands from ~/.zeta-g/commands and <cwd>/.zeta-g/commands. */
+    /** Load *.md commands from ~/.wholestack/commands and <cwd>/.wholestack/commands (or legacy .zeta-g/). */
     loadCustom(cwd: string): void;
     dispatch(input: string, base: Omit<CommandContext, "args" | "commands">): Promise<CommandResult | null>;
 }

package/dist/index.js

@@ -49,7 +49,7 @@ import {
   resolveModelKey,
   severityRank,
   supportsThinking
-} from "./chunk-FI67ER5S.js";
+} from "./chunk-7NZ77Q7Q.js";
 
 // src/prompts/template.ts
 var PLACEHOLDER = /\{\{([A-Za-z0-9_.]+)\}\}/g;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wholestack",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "Wholestack — a pro-grade conversational terminal agent for the Wholestack codegen engine. Talk to it in plain language: it writes ISL, generates full-stack or Solidity apps, and proves them with ShipGate. Browser login, membership-gated builds, slash commands, sessions, plan mode, diffs, MCP, plugins.",
   "type": "module",
   "main": "./dist/index.js",