clixad 0.0.1-beta.17 → 0.0.1-beta.18

package/dist/clixad.mjs

@@ -246,6 +246,11 @@ var init_client = __esm({
       referral_bonus: "referral bonus",
       redeem_code: "code redeemed",
       ad_reward: "offer reward",
+      // Our own survey, and it is deliberately not called an offer. Every other
+      // earn line on this list is a network paying for something; this one is us.
+      // The name is the only place a user would ever learn the difference, and
+      // "offer reward" would file it next to the wall it did not come from.
+      own_survey_reward: "Clixad survey",
       ad_screenout_bonus: "screenout bonus (didn't qualify)",
       ad_sponsor_impression: "sponsored line shown",
       ad_reversal: "offer reward reversed by the provider",
@@ -826,7 +831,18 @@ var init_client = __esm({
 });
 
 // src/config.ts
-import { chmodSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import {
+  chmodSync,
+  closeSync,
+  fsyncSync,
+  mkdirSync,
+  openSync,
+  readFileSync,
+  renameSync,
+  unlinkSync,
+  writeFileSync,
+  writeSync
+} from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 function sameEndpoint(a, b) {
@@ -841,11 +857,42 @@ function sameEndpoint(a, b) {
   };
   return norm(a) === norm(b);
 }
-function loadConfig() {
-  let stored = {};
+function takeConfigNotices() {
+  const out = notices;
+  notices = [];
+  return out;
+}
+function readStored() {
+  let raw;
   try {
-    stored = JSON.parse(readFileSync(CONFIG_PATH, "utf8"));
+    raw = readFileSync(CONFIG_PATH, "utf8");
+  } catch (err) {
+    const code = err.code;
+    if (code === "ENOENT") return { stored: {} };
+    return { stored: {}, problem: `could not be read (${code ?? err.message})` };
+  }
+  if (raw.trim() === "") return { stored: {}, problem: "was empty", raw };
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
   } catch {
+    return { stored: {}, problem: "is not valid JSON", raw };
+  }
+  if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+    return { stored: {}, problem: "is not a JSON object", raw };
+  }
+  return { stored: parsed };
+}
+function loadConfig() {
+  notices = [];
+  envApplied.clear();
+  const read = readStored();
+  const stored = read.stored;
+  if (read.problem) {
+    notices.push(
+      `Your Clixad config (${CONFIG_PATH}) ${read.problem}, so this session starts signed out.
+  It is kept at ${QUARANTINE_PATH} the next time anything is saved \u2014 sign in again with \`/login\`.`
+    );
   }
   const mintedAgainst = stored.gatewayUrl;
   for (const [key, stale] of Object.entries(SUPERSEDED_DEFAULTS)) {
@@ -857,17 +904,76 @@ function loadConfig() {
   const config = { ...DEFAULTS, ...stored };
   for (const [key, envVar] of ENV_OVERRIDES) {
     const value = process.env[envVar];
-    if (value) config[key] = value;
+    if (value) {
+      config[key] = value;
+      envApplied.add(key);
+    }
   }
-  const migratedGateway = mintedAgainst !== void 0 && stored.gatewayUrl === void 0;
-  if (migratedGateway && !sameEndpoint(mintedAgainst, config.gatewayUrl)) {
+  const boundTo = stored.tokenGateway ?? mintedAgainst;
+  const redirected = envApplied.has("gatewayUrl");
+  if (!redirected && boundTo !== void 0 && !sameEndpoint(boundTo, config.gatewayUrl)) {
+    if (stored.token !== void 0) {
+      notices.push(
+        `Signed out: the saved account belongs to ${boundTo}, and this run talks to ${config.gatewayUrl}.
+  Sign in again with \`/login\` (or \`clixad login\`).`
+      );
+    }
     for (const key of IDENTITY_KEYS) delete config[key];
   }
+  baseline = { ...config };
   return config;
 }
+function changedKeys(config) {
+  const current = config;
+  if (!baseline) return Object.keys(current);
+  const before = baseline;
+  const keys = /* @__PURE__ */ new Set([...Object.keys(before), ...Object.keys(current)]);
+  return [...keys].filter((key) => before[key] !== current[key]);
+}
+function writeAtomically(contents) {
+  const tmp = `${CONFIG_PATH}.${process.pid}.tmp`;
+  try {
+    const fd = openSync(tmp, "w", 384);
+    try {
+      writeSync(fd, contents);
+      fsyncSync(fd);
+    } finally {
+      closeSync(fd);
+    }
+    renameSync(tmp, CONFIG_PATH);
+  } catch (err) {
+    try {
+      unlinkSync(tmp);
+    } catch {
+    }
+    throw err;
+  }
+}
 function saveConfig(config) {
   mkdirSync(dirname(CONFIG_PATH), { recursive: true, mode: 448 });
-  writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2), { encoding: "utf8", mode: 384 });
+  const changed = changedKeys(config);
+  const current = readStored();
+  let base = {};
+  if (current.problem) {
+    if (current.raw !== void 0) {
+      try {
+        writeFileSync(QUARANTINE_PATH, current.raw, { encoding: "utf8", mode: 384 });
+      } catch {
+      }
+    }
+  } else {
+    base = current.stored;
+  }
+  const next = { ...base };
+  const source = config;
+  for (const key of changed) {
+    const value = source[key];
+    if (value === void 0) delete next[key];
+    else next[key] = value;
+  }
+  writeAtomically(`${JSON.stringify(next, null, 2)}
+`);
+  baseline = { ...config };
   try {
     chmodSync(CONFIG_PATH, 384);
   } catch {
@@ -876,11 +982,12 @@ function saveConfig(config) {
 function configPath() {
   return CONFIG_PATH;
 }
-var CONFIG_PATH, DEFAULTS, ENV_OVERRIDES, SUPERSEDED_DEFAULTS, IDENTITY_KEYS;
+var CONFIG_PATH, QUARANTINE_PATH, DEFAULTS, ENV_OVERRIDES, SUPERSEDED_DEFAULTS, IDENTITY_KEYS, baseline, envApplied, notices;
 var init_config = __esm({
   "src/config.ts"() {
     "use strict";
     CONFIG_PATH = join(homedir(), ".clixad", "config.json");
+    QUARANTINE_PATH = `${CONFIG_PATH}.corrupt`;
     DEFAULTS = {
       gatewayUrl: "https://clixad.onrender.com",
       // Same origin as the gateway: the ad wall is served by the gateway process
@@ -898,7 +1005,9 @@ var init_config = __esm({
       gatewayUrl: ["http://127.0.0.1:8787", "http://localhost:8787"],
       dashboardUrl: ["http://127.0.0.1:8788", "http://localhost:8788"]
     };
-    IDENTITY_KEYS = ["token", "userId", "email", "login"];
+    IDENTITY_KEYS = ["token", "userId", "email", "login", "tokenGateway"];
+    envApplied = /* @__PURE__ */ new Set();
+    notices = [];
   }
 });
 
@@ -958,6 +1067,7 @@ async function githubLogin(client, config, start, invite, report, signal) {
       config.userId = poll.userId;
       config.email = poll.email;
       config.login = poll.login;
+      config.tokenGateway = config.gatewayUrl;
       saveConfig(config);
       return {
         status: "ok",
@@ -987,6 +1097,7 @@ async function devLogin(client, config, email, invite) {
   config.token = res.token;
   config.userId = res.userId;
   config.email = res.email;
+  config.tokenGateway = config.gatewayUrl;
   delete config.login;
   saveConfig(config);
   return { status: "ok", account: { email: res.email, balance: res.balance, created: true } };
@@ -5129,7 +5240,7 @@ function useTerminalSize() {
   }, [stdout]);
   return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
 }
-function App({ client, config, wallet, streak, session, initialTask, sponsorServe }) {
+function App({ client, config, wallet, streak, session, initialTask, notices: notices2, sponsorServe }) {
   const { exit } = useApp();
   const { stdout, write: writeToStdout } = useStdout();
   const idRef = useRef(1);
@@ -5283,6 +5394,7 @@ function App({ client, config, wallet, streak, session, initialTask, sponsorServ
   useEffect(() => dropDelta, [dropDelta]);
   useEffect(() => {
     client.onNotice = (text2) => push({ kind: "notice", tone: "warn", text: text2 });
+    for (const text2 of notices2 ?? []) push({ kind: "notice", tone: "warn", text: `  ${text2}` });
     const files = contextRef.current.files;
     if (files.length) push({ kind: "notice", text: `  context: ${files.join(", ")}` });
     const streakLine = streak && streak.claimed ? streakLabel(streak) : null;
@@ -6769,6 +6881,8 @@ async function main() {
   const [cmd, ...rest] = process.argv.slice(2);
   const config = loadConfig();
   const client = new GatewayClient(config);
+  const configNotices = takeConfigNotices();
+  for (const text of configNotices) console.error(c.yellow(text));
   switch (cmd) {
     case "login":
       return login(client, config, rest);
@@ -6793,15 +6907,15 @@ async function main() {
     case "ask":
       return ask(client, config, rest.join(" "));
     case "agent":
-      return repl(client, config, { task: rest.join(" ").trim() || void 0 });
+      return repl(client, config, { task: rest.join(" ").trim() || void 0, notices: configNotices });
     case "-p":
     case "--print":
       return printCmd(client, config, rest.join(" ").trim());
     case "-c":
     case "--continue":
-      return repl(client, config, { resume: "latest" });
+      return repl(client, config, { resume: "latest", notices: configNotices });
     case "--resume":
-      return repl(client, config, { resume: rest[0] ?? "pick" });
+      return repl(client, config, { resume: rest[0] ?? "pick", notices: configNotices });
     case "code":
       return codeCmd(client, config, rest);
     case "help":
@@ -6816,7 +6930,7 @@ async function main() {
     case "-v":
       return void console.log(VERSION);
     case void 0:
-      return repl(client, config);
+      return repl(client, config, { notices: configNotices });
     default:
       if (cmd.startsWith("-")) {
         console.error(c.red(`unknown option: ${cmd}`));
@@ -6824,7 +6938,7 @@ async function main() {
         process.exitCode = 1;
         return;
       }
-      return repl(client, config, { task: [cmd, ...rest].join(" ").trim() });
+      return repl(client, config, { task: [cmd, ...rest].join(" ").trim(), notices: configNotices });
   }
 }
 async function login(client, config, args) {
@@ -6893,10 +7007,7 @@ function wrapPlain(text, width) {
 var sleep4 = (ms) => new Promise((r) => setTimeout(r, ms));
 var credits = (n) => n.toLocaleString("en-US");
 function logout(config) {
-  delete config.token;
-  delete config.userId;
-  delete config.email;
-  delete config.login;
+  for (const key of IDENTITY_KEYS) delete config[key];
   saveConfig(config);
   console.log(c.green("\u2713 logged out"));
 }
@@ -7235,7 +7346,15 @@ async function repl(client, config, opts = {}) {
   const wallet = await safeWallet(client);
   clearScreen();
   const { startTui: startTui2 } = await Promise.resolve().then(() => (init_tui(), tui_exports));
-  await startTui2({ client, config, wallet, streak, session, initialTask: opts.task });
+  await startTui2({
+    client,
+    config,
+    wallet,
+    streak,
+    session,
+    initialTask: opts.task,
+    ...opts.notices?.length ? { notices: opts.notices } : {}
+  });
 }
 async function runTurn(client, config, messages) {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clixad",
-  "version": "0.0.1-beta.17",
+  "version": "0.0.1-beta.18",
   "description": "Free AI coding agent in your terminal, funded by rewarded ads.",
   "license": "UNLICENSED",
   "type": "module",